[Modern] Revert close icon "always" shown as action on custom toolbar

On History/Download/Bookmarks, if we set close icon to "always" shown
as action, the other items can be collapsed into an overflow menu that
appears to the right of the close icon. We should temporarily set the
showAsAction back to "ifRoom" until we figure out a better way to
customize collapsing the items into an overflow menu.

Bug: 849849
Change-Id: Ic94f8d9071dc0295ec5adc10e36ab74eb4a2150b
Reviewed-on: https://chromium-review.googlesource.com/1114307Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570277}

chrome/android/java/res/menu/bookmark_action_bar_menu.xml

@@ -25,7 +25,7 @@
             android:id="@+id/close_menu_id"
             android:icon="@drawable/btn_close"
             android:title="@string/bookmark_action_bar_close"
-            app:showAsAction="always"
+            app:showAsAction="ifRoom"
             app:iconTint="@color/dark_mode_tint" />
     </group>
     <group

chrome/android/java/res/menu/download_manager_menu.xml

@@ -26,7 +26,7 @@
             android:id="@+id/close_menu_id"
             android:icon="@drawable/btn_close"
             android:title="@string/close"
-            app:showAsAction="always"
+            app:showAsAction="ifRoom"
             app:iconTint="@color/dark_mode_tint" />
      </group>
     <group android:id="@+id/with_settings_normal_menu_group"

chrome/android/java/res/menu/history_manager_menu.xml

@@ -25,7 +25,7 @@
             android:id="@+id/close_menu_id"
             android:icon="@drawable/btn_close"
             android:title="@string/close"
-            app:showAsAction="always"
+            app:showAsAction="ifRoom"
             app:iconTint="@color/dark_mode_tint" />
      </group>
      <group