Merging latest changes from the Feed repo up to c80d3c49fa92f00c05130106b29d5b49a735ac97

Changes merged:
https://chromium.googlesource.com/feed/+/c80d3c49fa92f00c05130106b29d5b49a735ac97

Change-Id: I7d676b458cc1d8e32aa2db104e0e81591d7a32d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353011
Commit-Queue: Dan H <harringtond@chromium.org>
Auto-Submit: Dan H <harringtond@chromium.org>
Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797443}

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

@@ -17,7 +17,6 @@ import android.widget.TextView;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
@@ -35,9 +34,6 @@ public class DebugLoggerTest {
     private static final String ERROR_TEXT_2 = "Exotic particle containment breach.";
     private static final String WARNING_TEXT = "Noncompliant meson entanglement.";
 
-    @Mock
-    private FrameContext mFrameContext;
-
     private Context mContext;
 
     private DebugLogger mDebugLogger;

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

@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.feed.library.common.ui.LayoutUtils;
 import org.chromium.chrome.browser.feed.library.piet.DebugLogger.MessageType;
 import org.chromium.chrome.browser.feed.library.piet.TextElementAdapter.TextElementKey;
 import org.chromium.chrome.browser.feed.library.piet.host.AssetProvider;
-import org.chromium.chrome.browser.feed.library.piet.host.TypefaceProvider;
 import org.chromium.chrome.browser.feed.library.piet.host.TypefaceProvider.GoogleSansTypeface;
 import org.chromium.components.feed.core.proto.ui.piet.BindingRefsProto.StyleBindingRef;
 import org.chromium.components.feed.core.proto.ui.piet.ElementsProto.CustomElement;
@@ -75,8 +74,6 @@ public class TextElementAdapterTest {
     private HostProviders mMockHostProviders;
     @Mock
     private AssetProvider mMockAssetProvider;
-    @Mock
-    private TypefaceProvider mMockTypefaceProvider;
 
     private AdapterParameters mAdapterParameters;
 

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: 5c177dff913851f5adaf4c536c67154c4c1041a7
+Last checked commit ID: c80d3c49fa92f00c05130106b29d5b49a735ac97