commit 471336d6d4fc09e77c51693e95305497df03f135
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 11 16:13:22 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 11 16:13:22 2021 +0000
tree 46aedba93dcd80a995dcbae3aefa12bba3a65b68
parent 2ad23573307e031176be1eacc22e616e4f4a503d
parent 38a599d2b8ed4c6af0eaca98595b539e8c68c70c

Merge cherrypicks of [14947192, 14947076, 14946934, 14946935, 14947213, 14947214, 14947216, 14947135, 14947136, 14947452, 14947333] into security-aosp-qt-release

Change-Id: Id2d43998d232bc799ec1b80b3ad10d871f46c1ed

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fa886c6..91d51c3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -569,7 +569,7 @@
                 <action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:priority="1000">
                 <action android:name="android.telephony.action.CONFIGURE_VOICEMAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>