Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev

am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28

AndroidManifest.xml

@@ -1994,7 +1994,7 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
-                  android:theme="@*android:style/Theme.Material.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
                 <category android:name="android.intent.category.DEFAULT" />