Merge Android 12

Bug: 202323961
Merged-In: I6c74f839d52db5c68812229a08b585ad416d5fed
Change-Id: I73dcd6fa78340f83324fdec050a137ef7007f069
diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp
index 58c15f3..1281453 100644
--- a/platform_tools/android/apps/skqp/src/main/Android.bp
+++ b/platform_tools/android/apps/skqp/src/main/Android.bp
@@ -19,10 +19,6 @@
     name: "CtsSkQPTestCases",
     defaults: ["cts_defaults"],
 
-    test_suites: [
-        "cts",
-        "vts10",
-    ],
     libs: ["android.test.runner.stubs"],
     jni_libs: ["libskqp_app"],
     compile_multilib: "both",