commit 127bd36f29376d67bcabd30c983866fcc676c32a
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 16 01:13:12 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 16 01:13:12 2021 +0000
tree 1a7d83a046d81d5482f5e02c8652786ddc406016
parent 0521b88085abf38b20d6cdd0db2664dca3005b2e
parent 704bf010cffb73dc1249e421a83af1eef68c5b52

Merge cherrypicks of [14988379, 14988380, 14984749, 14988513, 14988333, 14988334, 14988398, 14985920, 14988097, 14988381, 14985921, 14988891, 14987186, 14988382, 14989110, 14988514, 14988515, 14988652, 14988653, 14988654, 14988399, 14988400, 14988401, 14984579, 14987188, 14988532, 14988533, 14988402, 14983067, 14983068, 14974447, 14974448, 14988656, 14988535, 14988536, 14988537, 14988538, 14988539, 14988540, 14988541] into rvc-qpr3-release

Change-Id: Icd0bb59c3109c843f3c9e338782ed7b4a584441b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 340aab7..e99561f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -585,7 +585,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>