Merge cherrypicks of [20074816] into tm-qpr1-release.

Change-Id: I24dbae532b5b6f54cb2e674b73a93b0542bbcd51
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 788df5d..6cdda12 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -163,15 +163,14 @@
                 android:icon="@mipmap/picker_app_icon"
                 android:theme="@style/PickerDefaultTheme"
                 android:exported="true"
-                android:excludeFromRecents="true"
-                android:priority="100" >
-            <intent-filter>
+                android:excludeFromRecents="true" >
+            <intent-filter android:priority="100" >
                 <action android:name="android.provider.action.PICK_IMAGES" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="100" >
                 <action android:name="android.provider.action.PICK_IMAGES" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>