Merge "add permission check for exported activity" into rvc-qpr-dev am: 11ed014e am: be3cafd4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13209422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5025b0a00beadafed14f12e9872a0a3d146e0591

packages/CarrierDefaultApp/AndroidManifest.xml

@@ -48,6 +48,7 @@
             android:name="com.android.carrierdefaultapp.CaptivePortalLoginActivity"
             android:label="@string/action_bar_label"
             android:exported="true"
+            android:permission="android.permission.MODIFY_PHONE_STATE"
             android:theme="@style/AppTheme"
             android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>