Merge "Remove cts tag of MainlineCTS Permission test modules." into main

59 files changed, 0 insertions, 59 deletions

diff --git a/tests/cts/permission/Android.bp b/tests/cts/permission/Android.bp
index ed7fcea25..625fa2d9f 100644
--- a/tests/cts/permission/Android.bp
+++ b/tests/cts/permission/Android.bp
@@ -26,7 +26,6 @@ android_test {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp b/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
index df6bdf5c3..f95c9a9a5 100644
--- a/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
+++ b/tests/cts/permission/AppThatAccessesCalendarContactsBodySensorCustomPermission/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..e656e4ed5 100644
--- a/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp
+++ b/tests/cts/permission/AppThatAccessesLocationOnCommand/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
index af002df2b..3eb035495 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionA/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     certificate: ":cts-testkey1",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
index 6a622ca46..bd1b9dc15 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionADifferentCert/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
index 98f0a9aeb..dd3deaf45 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
index dd46066e9..5a399ebaa 100644
--- a/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
+++ b/tests/cts/permission/AppThatAlsoDefinesPermissionGroupADifferentCert30/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "30",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatDefinesPermissionA/Android.bp b/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
index e8125cd76..45eac27b0 100644
--- a/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionA/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     certificate: ":cts-testkey1",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
index 06f181f40..1d5cb6083 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     defaults: ["cts_defaults"],
     sdk_version: "current",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
index 527594589..d104f07fb 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithInvalidGroup30/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     defaults: ["cts_defaults"],
     sdk_version: "30",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp b/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
index 8d6279704..6c8be0cd2 100644
--- a/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
+++ b/tests/cts/permission/AppThatDefinesPermissionWithPlatformGroup/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     defaults: ["cts_defaults"],
     sdk_version: "current",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp b/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
index 684fd0559..df64b42de 100644
--- a/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
+++ b/tests/cts/permission/AppThatDefinesUndefinedPermissionGroupElement/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "test_current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp b/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
index 6e9936996..8512a5932 100644
--- a/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
+++ b/tests/cts/permission/AppThatDoesNotHaveBgLocationAccess/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatHasNotificationListener/Android.bp b/tests/cts/permission/AppThatHasNotificationListener/Android.bp
index 3f3563e87..ac8b58c6b 100644
--- a/tests/cts/permission/AppThatHasNotificationListener/Android.bp
+++ b/tests/cts/permission/AppThatHasNotificationListener/Android.bp
@@ -28,7 +28,6 @@ android_test_helper_app {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
index 5909e12b0..d9251facb 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermission30/Android.bp
@@ -31,7 +31,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
index c5abe6c18..790ccd82e 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermission31/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
index f5a0faa3a..ffab1ac65 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocation31/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
index 88a2765ca..31a0e7dc5 100644
--- a/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
+++ b/tests/cts/permission/AppThatRequestBluetoothPermissionNeverForLocationNoProvider/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp b/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
index a1364df32..bc02e9432 100644
--- a/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsAndCallLogPermission16/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..62bb1e3f3 100644
--- a/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsPermission15/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..2ef54910d 100644
--- a/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp
+++ b/tests/cts/permission/AppThatRequestContactsPermission16/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..6ec372c55 100644
--- a/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp
+++ b/tests/cts/permission/AppThatRequestDevicePermissions/Android.bp
@@ -25,7 +25,6 @@ android_test_helper_app {
     srcs: ["src/**/*.kt"],
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..f80eb0cda 100644
--- a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission28/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "vts10",
         "general-tests",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
index 095c24093..a9ad28a85 100644
--- a/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationAndBackgroundPermission29/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
     target_sdk_version: "29",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..c7034c46e 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission22/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..f7b45fb92 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission28/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
index 240795b30..cda2dc366 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission29/Android.bp
@@ -25,7 +25,6 @@ android_test_helper_app {
     target_sdk_version: "29",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp b/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
index 262438a04..e748622ef 100644
--- a/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
+++ b/tests/cts/permission/AppThatRequestLocationPermission29v4/Android.bp
@@ -25,7 +25,6 @@ android_test_helper_app {
     target_sdk_version: "29",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp b/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
index 4a8cddd5c..8c8adc534 100644
--- a/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
+++ b/tests/cts/permission/AppThatRequestMultiplePermissionsWithMinMaxSdk/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp b/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
index 50a347928..0fd4cf442 100644
--- a/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
+++ b/tests/cts/permission/AppThatRequestOneTimePermission/Android.bp
@@ -27,7 +27,6 @@ android_test_helper_app {
     min_sdk_version: "30",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "mts-permission",
         "general-tests",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp b/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
index b583b4603..f2834c773 100644
--- a/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
+++ b/tests/cts/permission/AppThatRequestPermissionAandB/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp b/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
index ae309b0bb..1ede19716 100644
--- a/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
+++ b/tests/cts/permission/AppThatRequestPermissionAandC/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp b/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
index a2bd97b3c..c141e272b 100644
--- a/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
+++ b/tests/cts/permission/AppThatRequestStoragePermission28/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..bda8bb2e7 100644
--- a/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp
+++ b/tests/cts/permission/AppThatRequestStoragePermission29/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp b/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
index 8f0ff524f..8ace7638c 100644
--- a/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
+++ b/tests/cts/permission/AppThatRequestSystemAlertWindow22/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     certificate: ":cts-testkey2",
     min_sdk_version: "22",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp b/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
index 73c5c8813..d50af0a00 100644
--- a/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
+++ b/tests/cts/permission/AppThatRequestSystemAlertWindow23/Android.bp
@@ -24,7 +24,6 @@ android_test_helper_app {
     certificate: ":cts-testkey2",
     min_sdk_version: "23",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/AppThatRunsRationaleTests/Android.bp b/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
index f6826784c..92414e271 100644
--- a/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
+++ b/tests/cts/permission/AppThatRunsRationaleTests/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
 
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
index 43e40d887..7fa8b6497 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission28/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
 
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..ec26600ca 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestLocationPermission29/Android.bp
@@ -26,7 +26,6 @@ android_test_helper_app {
 
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..dc520f04d 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestsNoPermissions/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     defaults: ["cts_defaults"],
     sdk_version: "current",
     test_suites: [
-        "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..f341c3fac 100644
--- a/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
+++ b/tests/cts/permission/AppWithSharedUidThatRequestsPermissions/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     defaults: ["cts_defaults"],
     sdk_version: "current",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/StorageEscalationApp28/Android.bp b/tests/cts/permission/StorageEscalationApp28/Android.bp
index f0c86433b..03001d8d6 100644
--- a/tests/cts/permission/StorageEscalationApp28/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp28/Android.bp
@@ -22,7 +22,6 @@ android_test_helper_app {
     name: "CtsStorageEscalationApp28",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/StorageEscalationApp29Full/Android.bp b/tests/cts/permission/StorageEscalationApp29Full/Android.bp
index 810032059..cc82f62e1 100644
--- a/tests/cts/permission/StorageEscalationApp29Full/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp29Full/Android.bp
@@ -22,7 +22,6 @@ android_test_helper_app {
     name: "CtsStorageEscalationApp29Full",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp b/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
index 12a5310e2..41034165d 100644
--- a/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
+++ b/tests/cts/permission/StorageEscalationApp29Scoped/Android.bp
@@ -22,7 +22,6 @@ android_test_helper_app {
     name: "CtsStorageEscalationApp29Scoped",
     certificate: ":cts-testkey2",
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/sdk28/Android.bp b/tests/cts/permission/sdk28/Android.bp
index 2bdffabe5..a4587bb6d 100644
--- a/tests/cts/permission/sdk28/Android.bp
+++ b/tests/cts/permission/sdk28/Android.bp
@@ -26,7 +26,6 @@ android_test {
     static_libs: ["ctstestrunner-axt"],
     // Tag this module as a cts test artifact
     test_suites: [
-        "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..42320ad4c 100644
--- a/tests/cts/permission/telephony/Android.bp
+++ b/tests/cts/permission/telephony/Android.bp
@@ -23,7 +23,6 @@ android_test {
     defaults: ["cts_defaults"],
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
index 344787045..79ba262c6 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionDefinerApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
index 4265d0924..93bc41724 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/AdversarialPermissionUserApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
index 987d29039..068a4544d 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionDefinerApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
index 9fcebb09b..334d15406 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionEscalatorApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
index a153e39c5..8e7a48936 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/InstallPermissionUserApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
index 6efcfdd01..88b063b4b 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionDefinerApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
index ab0b8a7b5..8a80e3bd2 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/RuntimePermissionUserApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "sts",
diff --git a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
index 41333cb57..85a9e7434 100644
--- a/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
+++ b/tests/cts/permission/testapps/RevokePermissionWhenRemoved/VictimPermissionDefinerApp/Android.bp
@@ -23,7 +23,6 @@ android_test_helper_app {
     sdk_version: "current",
     // Tag this module as a cts test artifact
     test_suites: [
-        "cts",
         "general-tests",
         "sts",
         "mts-permission",
diff --git a/tests/cts/permissionmultidevice/Android.bp b/tests/cts/permissionmultidevice/Android.bp
index a4ad3cab7..1ec0a2eee 100644
--- a/tests/cts/permissionmultidevice/Android.bp
+++ b/tests/cts/permissionmultidevice/Android.bp
@@ -44,7 +44,6 @@ android_test {
         ":CtsAccessRemoteDeviceCamera",
     ],
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permissionmultiuser/Android.bp b/tests/cts/permissionmultiuser/Android.bp
index b86b02205..11a4c197f 100644
--- a/tests/cts/permissionmultiuser/Android.bp
+++ b/tests/cts/permissionmultiuser/Android.bp
@@ -40,7 +40,6 @@ android_test {
         ":CtsRequestLocationApp",
     ],
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/permissionui/Android.bp b/tests/cts/permissionui/Android.bp
index 07167284d..cfceb3ec9 100644
--- a/tests/cts/permissionui/Android.bp
+++ b/tests/cts/permissionui/Android.bp
@@ -72,7 +72,6 @@ android_test {
         ":CtsUsePermissionAppStorage33",
     ],
     test_suites: [
-        "cts",
         "sts",
         "general-tests",
         "mts-permission",
diff --git a/tests/cts/role/Android.bp b/tests/cts/role/Android.bp
index 2a312976b..1768f0586 100644
--- a/tests/cts/role/Android.bp
+++ b/tests/cts/role/Android.bp
@@ -37,7 +37,6 @@ android_test {
     ],
 
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",
diff --git a/tests/cts/safetycenter/Android.bp b/tests/cts/safetycenter/Android.bp
index e49587c39..566fd6e33 100644
--- a/tests/cts/safetycenter/Android.bp
+++ b/tests/cts/safetycenter/Android.bp
@@ -45,7 +45,6 @@ android_test {
         "truth",
     ],
     test_suites: [
-        "cts",
         "general-tests",
         "mts-permission",
         "mcts-permission",