Fix ripple for the search/plus buttons in Duet.

The labels experiment introduce wrapping linear layouts that
had their own selection backgrounds, which conflicted with the
selection ripple of the pill drawable.

BUG=

Change-Id: I9b72fe0a2db424c8529f17cb0fd05bf1ff485118
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1832651Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701343}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarNewTabButton.java

@@ -70,7 +70,11 @@ class BottomToolbarNewTabButton extends ChromeImageButton
     public void setWrapperView(ViewGroup wrapper) {
         mWrapper = wrapper;
         mLabel = mWrapper.findViewById(R.id.new_tab_button_label);
-        if (FeatureUtilities.isLabeledBottomToolbarEnabled()) mLabel.setVisibility(View.VISIBLE);
+        if (FeatureUtilities.isLabeledBottomToolbarEnabled()) {
+            mLabel.setVisibility(View.VISIBLE);
+        } else {
+            mWrapper.setBackground(null);
+        }
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/SearchAccelerator.java

@@ -64,7 +64,11 @@ class SearchAccelerator extends ChromeImageButton
     public void setWrapperView(ViewGroup wrapper) {
         mWrapper = wrapper;
         mLabel = mWrapper.findViewById(R.id.search_accelerator_label);
-        if (FeatureUtilities.isLabeledBottomToolbarEnabled()) mLabel.setVisibility(View.VISIBLE);
+        if (FeatureUtilities.isLabeledBottomToolbarEnabled()) {
+            mLabel.setVisibility(View.VISIBLE);
+        } else {
+            mWrapper.setBackground(null);
+        }
     }
 
     @Override