Merging change f1bd7d30fd0bbb9fb9c8d7c0d99432be45330179.

Change-Id: I6e00f1453a423ed9069e1870a0fa6c21230810ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135049Reviewed-by: Dan H <harringtond@chromium.org>
Commit-Queue: Jonathan Freed <freedjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756288}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/AdapterParameters.java

@@ -42,7 +42,7 @@ class AdapterParameters {
     // Doesn't like passing "this" to the new ElementAdapterFactory; however, nothing in the
     // factory's construction will reference the elementAdapterFactory member of this, so should be
     // safe.
-    @SuppressWarnings("initialization")
+    @SuppressWarnings("nullness")
     public AdapterParameters(Context context, Supplier<ViewGroup> parentViewSupplier,
             HostProviders hostProviders, Clock clock, boolean allowLegacyRoundedCornerImpl,
             boolean allowOutlineRoundedCornerImpl) {

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/BorderDrawable.java

@@ -34,7 +34,7 @@ public class BorderDrawable extends ShapeDrawable {
     }
 
     // Doesn't like calls to getPaint()
-    @SuppressWarnings("initialization")
+    @SuppressWarnings("nullness")
     public BorderDrawable(Context context, Borders borders, float[] cornerRadii, boolean isRtL,
             int width, int height) {
         super(new RoundRectShape(cornerRadii, null, null));

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/GradientDrawable.java

@@ -13,7 +13,7 @@ import org.chromium.components.feed.core.proto.ui.piet.GradientsProto.LinearGrad
 /** Class to display gradients according to the Piet spec (angle + color stops at %ages) */
 public class GradientDrawable extends ShapeDrawable {
     // Doesn't like the call to setShape and setShaderFactory
-    @SuppressWarnings("initialization")
+    @SuppressWarnings("nullness")
     public GradientDrawable(LinearGradient gradient, Supplier<Boolean> rtlSupplier) {
         super();
 

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/ui/RoundedCornerWrapperView.java

@@ -74,7 +74,7 @@ public class RoundedCornerWrapperView extends FrameLayout {
     private int mRoundedCornerRadius;
 
     // Doesn't like the call to setOutlineProvider
-    @SuppressWarnings("initialization")
+    @SuppressWarnings("nullness")
     public RoundedCornerWrapperView(Context context, RoundedCorners roundedCorners,
             RoundedCornerMaskCache maskCache, Supplier<Boolean> isRtLSupplier, int radiusOverride,
             Borders borders, boolean allowClipPath, boolean allowOutlineRounding) {

chrome/android/feed/merging.md

@@ -8,4 +8,4 @@ Commits that don't touch these files do not cause changes here.
 The hash below represents the last commit from that repo that was reviewed for
 the potential need to merge here.
 
-Last checked commit ID: a9662901062a748b7f018e5ef194f13708546292
\ No newline at end of file
+Last checked commit ID: f1bd7d30fd0bbb9fb9c8d7c0d99432be45330179
\ No newline at end of file