Merge tag 'android-11.0.0_r48' into int/11/fp3
Android 11.0.0 Release 48 (RD2A.211001.002)
* tag 'android-11.0.0_r48':
Check READ_PRIVILEGED_PHONE_STATE in getAvailableSubscriptionInfoList CTS
Verify SAF blocks directory access to /sdcard/Android
[security] SubscriptionGroup is exposed to unprivileged callers
Change-Id: If34724b390a7aa75a8b40b63dcea972915db497e
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index c24f26b..3825d8f 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -123,7 +123,7 @@
</intent-filter>
</activity>
<activity android:name="android.media.cts.MockActivity" />
- <activity android:name="android.media.cts.MediaRouter2TestActivity" />
+ <activity android:name="android.media.cts.MediaRouter2TestActivity"/>
<service android:name="android.media.cts.RemoteVirtualDisplayService"
android:process=":remoteService" >
<intent-filter>