Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 214d32a..9986e34 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1846,7 +1846,7 @@
                   android:exported="true"
                   android:clearTaskOnLaunch="true"
                   android:theme="@style/Theme.Settings.NoActionBar">
-            <intent-filter>
+            <intent-filter android:priority="1000">
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>