Automated g4 rollback of changelist 470727992

PiperOrigin-RevId: 471050462

Author: paulfthomas

catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java

@@ -18,7 +18,6 @@
 
 import io.material.catalog.R;
 
-import android.annotation.SuppressLint;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -185,7 +184,6 @@ private void setUpBottomAppBarShapeAppearance() {
         babBackground.getShapeAppearanceModel().toBuilder().setTopEdge(topEdge).build());
   }
 
-  @SuppressLint("NewApi")
   protected void setUpBottomDrawer(View view) {
     View bottomDrawer = coordinatorLayout.findViewById(R.id.bottom_drawer);
     bottomDrawerBehavior = BottomSheetBehavior.from(bottomDrawer);
@@ -195,7 +193,6 @@ protected void setUpBottomDrawer(View view) {
         v -> bottomDrawerBehavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED));
     bar.setNavigationIcon(R.drawable.ic_drawer_menu_24px);
     bar.replaceMenu(R.menu.demo_primary);
-    bar.getMenu().findItem(R.id.menu_search).getActionView().requestFocus();
   }
 
   private void showSnackbar(CharSequence text) {

catalog/java/io/material/catalog/bottomappbar/res/menu/demo_primary.xml

@@ -18,7 +18,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
   <item
-      android:id="@+id/menu_search"
       android:icon="@drawable/ic_search_24px"
       android:title="@string/cat_bottomappbar_search"
       app:showAsAction="ifRoom"/>