Merge "Change accessibility setup page to use glif v3 theme"

diff --combined AndroidManifest.xml
index 651ef48,f696e4b..c13068f
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -1394,7 -1394,7 +1394,7 @@@
          <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
                  android:icon="@drawable/ic_accessibility_suggestion"
                  android:label="@string/vision_settings_title"
-                 android:theme="@style/GlifTheme.Light">
+                 android:theme="@style/GlifV3Theme.Light">
              <intent-filter android:priority="1">
                  <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                  <category android:name="android.intent.category.DEFAULT" />
@@@ -2455,18 -2455,6 +2455,18 @@@
          </activity>
  
          <activity
 +            android:name="Settings$AppBubbleNotificationSettingsActivity"
 +            android:label="@string/bubbles_app_toggle_title"
 +            android:parentActivityName="Settings$NotificationAppListActivity">
 +            <intent-filter android:priority="1">
 +                <action android:name="android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS" />
 +                <category android:name="android.intent.category.DEFAULT" />
 +            </intent-filter>
 +            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
 +                       android:value="com.android.settings.notification.AppBubbleNotificationSettings" />
 +        </activity>
 +
 +        <activity
              android:name="Settings$SoundSettingsActivity"
              android:label="@string/sound_settings"
              android:icon="@drawable/ic_homepage_sound"