[RESTRICT AUTOMERGE] Remove some mcts tags to align with main and CTS R1

Bug: 353146065
Bug:
Change-Id: I7a90db6a37f078e4322979bbf8b39baae8a7278c

54 files changed, 0 insertions, 54 deletions

diff --git a/tests/cts/permission/Android.bp b/tests/cts/permission/Android.bp
index 965a9eb58..43a7be006 100644
--- a/tests/cts/permission/Android.bp
+++ b/tests/cts/permission/Android.bp
@@ -30,7 +30,6 @@ android_test {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     // Include both the 32 and 64 bit versions
     compile_multilib: "both",
diff --git a/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp b/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
index df6bdf5c3..fdb0be452 100644
--- a/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
+++ b/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
@@ -31,6 +31,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp b/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp
index d4573d264..2bb3dd3ab 100644
--- a/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp
+++ b/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp
@@ -32,7 +32,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: [
         "src/**/*.java",
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
index af002df2b..46b7aecd3 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
index 6a622ca46..c88d0f7fe 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
index 98f0a9aeb..b1ef695ac 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
index dd46066e9..52900dfc3 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatDefinesPermissionA/Android.bp b/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
index e8125cd76..54a575b4f 100644
--- a/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
index 06f181f40..9029b3a98 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
index 527594589..04961e265 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
index 8d6279704..687ad7488 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp b/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
index 684fd0559..c00d26d3a 100644
--- a/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
+++ b/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: ["src/**/*.kt"],
 }
diff --git a/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp b/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
index 6e9936996..f9ff21c6f 100644
--- a/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
+++ b/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
@@ -32,6 +32,5 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatHasNotificationListener/Android.bp b/tests/cts/permission/AppThatHasNotificationListener/Android.bp
index 3f3563e87..419ab5d66 100644
--- a/tests/cts/permission/AppThatHasNotificationListener/Android.bp
+++ b/tests/cts/permission/AppThatHasNotificationListener/Android.bp
@@ -32,7 +32,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: [
         "src/**/*.java",
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
index 5909e12b0..a3fe38109 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
@@ -35,7 +35,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: [":AppThatRequestBluetoothPermission"],
 }
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
index c5abe6c18..7dc2e2445 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: [":AppThatRequestBluetoothPermission"],
 }
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
index f5a0faa3a..857f2e2f4 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: [":AppThatRequestBluetoothPermission"],
 }
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
index 88a2765ca..6f635c0cc 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp b/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
index a1364df32..1a057d010 100644
--- a/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp b/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp
index bb9ea42dc..54618447e 100644
--- a/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp b/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp
index a378c0c7f..2dca5aa2c 100644
--- a/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp b/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp
index 10ee18ed6..c0a9f9914 100644
--- a/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp
+++ b/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
index eaf10f50c..5a60a3fbd 100644
--- a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
@@ -28,6 +28,5 @@ android_test_helper_app {
         "vts10",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
index 095c24093..de6c3cbb2 100644
--- a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
@@ -29,6 +29,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp
index 32d8505fb..25d9893ec 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp
index 29ade84d2..bfeadbd58 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
index f0ad55cb5..dd320a77f 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
index 424e8878b..721f71534 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp b/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
index 4a8cddd5c..5fcc6c8ba 100644
--- a/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
+++ b/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp b/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
index 470b96225..d9c2f76c2 100644
--- a/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
+++ b/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
@@ -30,7 +30,6 @@ android_test_helper_app {
         "cts",
         "mts-permission",
         "general-tests",
-        "mcts-permission",
     ],
     srcs: ["src/**/*.java"],
     sdk_version: "test_current",
diff --git a/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp b/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
index b583b4603..6c037b456 100644
--- a/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
+++ b/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: ["src/**/*.java"],
 }
diff --git a/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp b/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
index ae309b0bb..b94965334 100644
--- a/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
+++ b/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     srcs: ["src/**/*.java"],
 }
diff --git a/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp b/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
index a2bd97b3c..50ae9209b 100644
--- a/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp b/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp
index 5b1c73f3a..4663be9dc 100644
--- a/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp
@@ -27,6 +27,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp b/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
index 61dccc22e..bafa460f1 100644
--- a/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
+++ b/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp b/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
index e4ff72113..6c35f1881 100644
--- a/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
+++ b/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/AppThatRunsRationaleTests/Android.bp b/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
index f6826784c..30019fba5 100644
--- a/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
+++ b/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
@@ -29,7 +29,6 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 
     srcs: ["src/**/*.java"],
diff --git a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
index 43e40d887..8214c425d 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
@@ -29,6 +29,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
index c76088043..3df5c9a7d 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
@@ -29,6 +29,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp b/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
index a00cf0df1..7dd3ef638 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
@@ -26,6 +26,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp b/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
index ff95c1b86..c58b3e81e 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
@@ -26,6 +26,5 @@ android_test_helper_app {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/StorageEscalationApp28/Android.bp b/tests/cts/permission/StorageEscalationApp28/Android.bp
index 0c96cc400..3953e5e27 100644
--- a/tests/cts/permission/StorageEscalationApp28/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp28/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/StorageEscalationApp29Full/Android.bp b/tests/cts/permission/StorageEscalationApp29Full/Android.bp
index 966f1500f..50ea8c60d 100644
--- a/tests/cts/permission/StorageEscalationApp29Full/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp29Full/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp b/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
index 22462cff4..716e31e09 100644
--- a/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     sdk_version: "test_current",
 }
diff --git a/tests/cts/permission/sdk28/Android.bp b/tests/cts/permission/sdk28/Android.bp
index 2bdffabe5..3043c9329 100644
--- a/tests/cts/permission/sdk28/Android.bp
+++ b/tests/cts/permission/sdk28/Android.bp
@@ -29,6 +29,5 @@ android_test {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
 }
diff --git a/tests/cts/permission/telephony/Android.bp b/tests/cts/permission/telephony/Android.bp
index 5ded57ab3..bbfe06c55 100644
--- a/tests/cts/permission/telephony/Android.bp
+++ b/tests/cts/permission/telephony/Android.bp
@@ -26,7 +26,6 @@ android_test {
         "cts",
         "general-tests",
         "mts-permission",
-        "mcts-permission",
     ],
     // Include both the 32 and 64 bit versions
     compile_multilib: "both",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
index 344787045..6f0bcf111 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey1",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
index 4265d0924..41f01e981 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey2",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
index 987d29039..a3e1f13d2 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey1",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
index 9fcebb09b..caaa8e898 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey1",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
index a153e39c5..d9ca4c8ea 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey2",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
index 6efcfdd01..b4ea30ada 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey1",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
index ab0b8a7b5..22c6ccd6f 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "mts-permission",
         "sts",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey2",
 }
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
index 41333cb57..5627a3d36 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
         "general-tests",
         "sts",
         "mts-permission",
-        "mcts-permission",
     ],
     certificate: ":cts-testkey1",
 }