Revert of MD Settings: Elim SettingsSubpageBrowsertest and SettingsPageVisibility

chrome/browser/resources/settings/settings_ui/settings_ui.html

Index: chrome/browser/resources/settings/settings_ui/settings_ui.html
diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
index 8eb259d6e9ceba1fbdc039e56ab893546ec3b786..391759f7dc6572f1e34a984a3f22679fe84de702 100644
--- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
+++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
@@ -96,6 +96,7 @@
       <div class="drawer-content">
         <template is="dom-if" id="drawerTemplate">
           <settings-menu page-visibility="[[pageVisibility_]]"
+              show-android-apps="[[showAndroidApps_]]"
               on-iron-activate="onIronActivate_"
               advanced-opened="{{advancedOpened_}}">
           </settings-menu>
@@ -109,6 +110,7 @@
       <settings-main id="main" prefs="{{prefs}}"
           toolbar-spinner-active="{{toolbarSpinnerActive_}}"
           page-visibility="[[pageVisibility_]]"
+          show-android-apps="[[showAndroidApps_]]"
           advanced-toggle-expanded="{{advancedOpened_}}">
       </settings-main>
     </div>