Snap for 11510257 from 0186312e68a741cc44fd1124dd96b7c7f13f92b7 to simpleperf-releasesimpleperf-release

Change-Id: I16beb97e751b41204b23bccb0c6d0a98e0c57457

37 files changed, 108 insertions, 71 deletions

diff --git a/adservices/apk/unittest/Android.bp b/adservices/apk/unittest/Android.bp
index a591af3bb..63fbb02ce 100644
--- a/adservices/apk/unittest/Android.bp
+++ b/adservices/apk/unittest/Android.bp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 package {
+    default_team: "trendy_team_android_rubidium",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/adservices/libraries/cobalt/tests/Android.bp b/adservices/libraries/cobalt/tests/Android.bp
index d2af18c60..9412436e1 100644
--- a/adservices/libraries/cobalt/tests/Android.bp
+++ b/adservices/libraries/cobalt/tests/Android.bp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 package {
+    default_team: "trendy_team_android_rubidium",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/adservices/libraries/collectors-helper/tests/Android.bp b/adservices/libraries/collectors-helper/tests/Android.bp
index 73e038050..40044933e 100644
--- a/adservices/libraries/collectors-helper/tests/Android.bp
+++ b/adservices/libraries/collectors-helper/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_rubidium",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/framework/Android.bp b/sdksandbox/framework/Android.bp
index cb84b3cca..14cfc042e 100644
--- a/sdksandbox/framework/Android.bp
+++ b/sdksandbox/framework/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/service/Android.bp b/sdksandbox/service/Android.bp
index 721d23800..760973dd1 100644
--- a/sdksandbox/service/Android.bp
+++ b/sdksandbox/service/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/cts/endtoendtests/Android.bp b/sdksandbox/tests/cts/endtoendtests/Android.bp
index 36f1002bf..f84f9302c 100644
--- a/sdksandbox/tests/cts/endtoendtests/Android.bp
+++ b/sdksandbox/tests/cts/endtoendtests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/cts/endtoendtests/providers/CtsProvider/Android.bp b/sdksandbox/tests/cts/endtoendtests/providers/CtsProvider/Android.bp
index 77a394959..7c59d86d0 100644
--- a/sdksandbox/tests/cts/endtoendtests/providers/CtsProvider/Android.bp
+++ b/sdksandbox/tests/cts/endtoendtests/providers/CtsProvider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/cts/hostside/Android.bp b/sdksandbox/tests/cts/hostside/Android.bp
index cc78b41ea..8bd582b33 100644
--- a/sdksandbox/tests/cts/hostside/Android.bp
+++ b/sdksandbox/tests/cts/hostside/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -81,7 +82,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "provider/src/**/dataisolationtest/*.java",
+        "provider/src/**/dataisolationtest/*.java",
     ],
     static_libs: [
         "CtsDataIsolationTestSdkApi",
@@ -104,7 +105,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "provider/src/**/storagetest/*.java",
+        "provider/src/**/storagetest/*.java",
     ],
     static_libs: [
         "CtsStorageTestSdkApi",
@@ -120,7 +121,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "provider/src/**/mediationtest/*.java",
+        "provider/src/**/mediationtest/*.java",
     ],
     static_libs: [
         "CtsMediationTestSdkApi",
diff --git a/sdksandbox/tests/cts/inprocess/Android.bp b/sdksandbox/tests/cts/inprocess/Android.bp
index a9902e3b2..ba131cd16 100644
--- a/sdksandbox/tests/cts/inprocess/Android.bp
+++ b/sdksandbox/tests/cts/inprocess/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/hostsidetests/Android.bp b/sdksandbox/tests/hostsidetests/Android.bp
index 7f5a443bd..6b68d47cf 100644
--- a/sdksandbox/tests/hostsidetests/Android.bp
+++ b/sdksandbox/tests/hostsidetests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -51,7 +52,7 @@ java_test_host {
         ":TestCodeProvider",
         ":TestCodeProvider2",
         ":SdkSandboxTestApp",
-        ":SdkSandboxTestDebuggableApp"
+        ":SdkSandboxTestDebuggableApp",
     ],
 }
 
@@ -159,7 +160,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "codeprovider/src/**/TestSandboxedSdkProvider.java",
+        "codeprovider/src/**/TestSandboxedSdkProvider.java",
     ],
     libs: [
         "framework-sdksandbox.impl",
@@ -175,7 +176,7 @@ android_test_helper_app {
     certificate: ":sdksandbox-test",
     defaults: ["platform_app_defaults"],
     srcs: [
-       "codeprovider/src/**/TestSandboxedSdkProvider2.java",
+        "codeprovider/src/**/TestSandboxedSdkProvider2.java",
     ],
     libs: [
         "framework-sdksandbox.impl",
diff --git a/sdksandbox/tests/hostsidetests/BroadcastRestrictionsHostTest/Android.bp b/sdksandbox/tests/hostsidetests/BroadcastRestrictionsHostTest/Android.bp
index d320dc9e2..3fc86d189 100644
--- a/sdksandbox/tests/hostsidetests/BroadcastRestrictionsHostTest/Android.bp
+++ b/sdksandbox/tests/hostsidetests/BroadcastRestrictionsHostTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -36,25 +37,25 @@ android_test_helper_app {
     name: "BroadcastRestrictionsTestApp",
     manifest: "app/BroadcastRestrictionsTestAppManifest.xml",
     srcs: [
-            "app/src/**/BroadcastRestrictionsTestApp.java",
-            ":framework-sdksandbox-sources",
-            ":sdksandbox_aidl",
-            ":sdksandbox-sources",
-            "sdkprovider/src/**/*.aidl",
-        ],
-        defaults: ["framework-sdksandbox-jarjar-defaults"],
-        static_libs: [
-            "androidx.core_core",
-            "androidx.test.ext.junit",
-            "compatibility-device-util-axt",
-            "SdkSandboxTestUtils",
-            "BroadcastsSdkInterfaces",
-            "modules-utils-build",
-        ],
-        test_suites: ["general-tests"],
-        platform_apis: true,
-        min_sdk_version: "33",
-        target_sdk_version: "33",
+        "app/src/**/BroadcastRestrictionsTestApp.java",
+        ":framework-sdksandbox-sources",
+        ":sdksandbox_aidl",
+        ":sdksandbox-sources",
+        "sdkprovider/src/**/*.aidl",
+    ],
+    defaults: ["framework-sdksandbox-jarjar-defaults"],
+    static_libs: [
+        "androidx.core_core",
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "SdkSandboxTestUtils",
+        "BroadcastsSdkInterfaces",
+        "modules-utils-build",
+    ],
+    test_suites: ["general-tests"],
+    platform_apis: true,
+    min_sdk_version: "33",
+    target_sdk_version: "33",
 }
 
 android_test_helper_app {
@@ -66,9 +67,9 @@ android_test_helper_app {
         "framework-sdksandbox-jarjar-defaults",
     ],
     srcs: [
-       "sdkprovider/src/**/*.java",
-       ":framework-sdksandbox-sources",
-       "sdkprovider/src/**/*.aidl",
+        "sdkprovider/src/**/*.java",
+        ":framework-sdksandbox-sources",
+        "sdkprovider/src/**/*.aidl",
     ],
     static_libs: [
         "BroadcastsSdkInterfaces",
@@ -84,4 +85,4 @@ java_library {
     srcs: [
         "src/**/*.aidl",
     ],
-}
\ No newline at end of file
+}
diff --git a/sdksandbox/tests/hostsidetests/ContentProviderRestrictionsHostTest/Android.bp b/sdksandbox/tests/hostsidetests/ContentProviderRestrictionsHostTest/Android.bp
index dbbbeae77..36d09f71e 100644
--- a/sdksandbox/tests/hostsidetests/ContentProviderRestrictionsHostTest/Android.bp
+++ b/sdksandbox/tests/hostsidetests/ContentProviderRestrictionsHostTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -36,20 +37,20 @@ android_test_helper_app {
     name: "ContentProviderRestrictionsTestApp",
     manifest: "app/ContentProviderRestrictionsTestAppManifest.xml",
     srcs: [
-            "app/src/**/ContentProviderRestrictionsTestApp.java",
-            "app/src/**/SdkSandboxEmptyActivity.java",
-            ":framework-sdksandbox-sources",
-            ":sdksandbox_aidl",
-            ":sdksandbox-sources",
-            "sdkprovider/src/**/*.aidl",
+        "app/src/**/ContentProviderRestrictionsTestApp.java",
+        "app/src/**/SdkSandboxEmptyActivity.java",
+        ":framework-sdksandbox-sources",
+        ":sdksandbox_aidl",
+        ":sdksandbox-sources",
+        "sdkprovider/src/**/*.aidl",
     ],
     defaults: ["framework-sdksandbox-jarjar-defaults"],
     static_libs: [
-            "androidx.core_core",
-            "androidx.test.ext.junit",
-            "compatibility-device-util-axt",
-            "SdkSandboxTestUtils",
-            "ContentProvidersSdkInterfaces",
+        "androidx.core_core",
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "SdkSandboxTestUtils",
+        "ContentProvidersSdkInterfaces",
     ],
     test_suites: ["general-tests"],
     platform_apis: true,
@@ -66,9 +67,9 @@ android_test_helper_app {
         "framework-sdksandbox-jarjar-defaults",
     ],
     srcs: [
-       "sdkprovider/src/**/*.java",
-       ":framework-sdksandbox-sources",
-       "sdkprovider/src/**/*.aidl",
+        "sdkprovider/src/**/*.java",
+        ":framework-sdksandbox-sources",
+        "sdkprovider/src/**/*.aidl",
     ],
     static_libs: [
         "ContentProvidersSdkInterfaces",
diff --git a/sdksandbox/tests/hostsidetests/SdkSandboxMetricsHostTest/Android.bp b/sdksandbox/tests/hostsidetests/SdkSandboxMetricsHostTest/Android.bp
index 656dbebd4..887c9bccc 100644
--- a/sdksandbox/tests/hostsidetests/SdkSandboxMetricsHostTest/Android.bp
+++ b/sdksandbox/tests/hostsidetests/SdkSandboxMetricsHostTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -55,6 +56,7 @@ android_test_helper_app {
     target_sdk_version: "33",
     test_suites: ["general-tests"],
 }
+
 java_library {
     name: "CrashTestSdkApi",
     srcs: [
@@ -70,7 +72,7 @@ android_test_helper_app {
         "framework-sdksandbox-jarjar-defaults",
     ],
     srcs: [
-       "sdkprovider/src/**/*.java",
+        "sdkprovider/src/**/*.java",
     ],
     static_libs: [
         "CrashTestSdkApi",
diff --git a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp
index a3368b740..c8fc4827b 100644
--- a/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp
+++ b/sdksandbox/tests/hostsidetests/SdkSandboxStorageHostTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -78,7 +79,7 @@ android_test_helper_app {
     manifest: "codeprovider/StorageTestCodeProvider.xml",
     defaults: ["platform_app_defaults"],
     srcs: [
-       "codeprovider/src/**/*.java",
+        "codeprovider/src/**/*.java",
     ],
     static_libs: [
         "compatibility-device-util-axt",
diff --git a/sdksandbox/tests/inprocess/Android.bp b/sdksandbox/tests/inprocess/Android.bp
index 38be9f03a..bd3e063a2 100644
--- a/sdksandbox/tests/inprocess/Android.bp
+++ b/sdksandbox/tests/inprocess/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
index 1029eb539..765dc376f 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxClient_SharedUid/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxClient_SharedUid/Android.bp
index abb1a0361..4310f2dd5 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxClient_SharedUid/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxClient_SharedUid/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
index 81311a8f5..37889e6ab 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxCodeProvider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -32,11 +33,11 @@ android_test_helper_app {
     name: "SdkSandboxCodeProvider",
     defaults: [
         "platform_app_defaults",
-        "SdkSandboxCodeDefaults"
+        "SdkSandboxCodeDefaults",
     ],
     srcs: [
-       "src/**/sdksandboxcode_1/*.java",
-       "src/**/apiimplementation/*.java",
+        "src/**/sdksandboxcode_1/*.java",
+        "src/**/apiimplementation/*.java",
     ],
     manifest: "AndroidManifest.xml",
     test_suites: ["general-tests"],
@@ -46,11 +47,11 @@ android_test_helper_app {
     name: "SdkSandboxWebViewProvider",
     defaults: [
         "platform_app_defaults",
-        "SdkSandboxCodeDefaults"
+        "SdkSandboxCodeDefaults",
     ],
     srcs: [
-       "src/**/sdksandboxcode_webview/*.java",
-       "src/**/apiimplementation/*.java"
+        "src/**/sdksandboxcode_webview/*.java",
+        "src/**/apiimplementation/*.java",
     ],
     manifest: "AndroidManifest_WebViewProvider.xml",
     test_suites: ["general-tests"],
@@ -60,11 +61,11 @@ android_test_helper_app {
     name: "SdkSandboxMediateeProvider",
     defaults: [
         "platform_app_defaults",
-        "SdkSandboxCodeDefaults"
+        "SdkSandboxCodeDefaults",
     ],
     srcs: [
-       "src/**/sdksandboxcode_mediatee/*.java",
-       "src/**/apiimplementation/*.java"
+        "src/**/sdksandboxcode_mediatee/*.java",
+        "src/**/apiimplementation/*.java",
     ],
     manifest: "AndroidManifest_MediateeProvider.xml",
     test_suites: ["general-tests"],
diff --git a/sdksandbox/tests/manual-test-apps/SdkSandboxWebViewClient/Android.bp b/sdksandbox/tests/manual-test-apps/SdkSandboxWebViewClient/Android.bp
index 9841bb320..6390dd9a2 100644
--- a/sdksandbox/tests/manual-test-apps/SdkSandboxWebViewClient/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/SdkSandboxWebViewClient/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/manual-test-apps/sdkinterfaces/Android.bp b/sdksandbox/tests/manual-test-apps/sdkinterfaces/Android.bp
index fab96332c..affaab0fc 100644
--- a/sdksandbox/tests/manual-test-apps/sdkinterfaces/Android.bp
+++ b/sdksandbox/tests/manual-test-apps/sdkinterfaces/Android.bp
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
+
 java_library {
     name: "SdkInterfaces",
     srcs: [
         "src/**/*.aidl",
     ],
 }
-
diff --git a/sdksandbox/tests/perf/scenarios/Android.bp b/sdksandbox/tests/perf/scenarios/Android.bp
index dea550a5d..8aa8658e0 100644
--- a/sdksandbox/tests/perf/scenarios/Android.bp
+++ b/sdksandbox/tests/perf/scenarios/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
@@ -37,4 +38,4 @@ java_library {
 
     srcs: ["src/**/*.java"],
 
-}
\ No newline at end of file
+}
diff --git a/sdksandbox/tests/perf/scenarios/tests/Android.bp b/sdksandbox/tests/perf/scenarios/tests/Android.bp
index b663d6cdb..4a3ee8f44 100644
--- a/sdksandbox/tests/perf/scenarios/tests/Android.bp
+++ b/sdksandbox/tests/perf/scenarios/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
@@ -34,7 +35,10 @@ android_test {
     certificate: "platform",
     platform_apis: true,
     srcs: ["src//**/*.java"],
-    test_suites: ["device-tests", "general-tests"],
+    test_suites: [
+        "device-tests",
+        "general-tests",
+    ],
     data: [":perfetto_artifacts"],
     min_sdk_version: "33",
 }
diff --git a/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp b/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp
index 6e5edcae3..360cf7d85 100644
--- a/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp
+++ b/sdksandbox/tests/test-apps/CodeProviderWithResources/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -21,7 +22,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "src/**/*.java",
+        "src/**/*.java",
     ],
     resource_dirs: ["res"],
     platform_apis: true,
@@ -33,4 +34,3 @@ android_test_helper_app {
     min_sdk_version: "33",
     target_sdk_version: "33",
 }
-
diff --git a/sdksandbox/tests/test-apps/EmptyProvider/Android.bp b/sdksandbox/tests/test-apps/EmptyProvider/Android.bp
index 779b2d596..4edc6ff94 100644
--- a/sdksandbox/tests/test-apps/EmptyProvider/Android.bp
+++ b/sdksandbox/tests/test-apps/EmptyProvider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -21,12 +22,12 @@ android_test_helper_app {
     manifest: "AndroidManifest.xml",
     certificate: ":sdksandbox-test",
     srcs: [
-      "src/**/*.java",
+        "src/**/*.java",
     ],
     min_sdk_version: "33",
     target_sdk_version: "33",
     visibility: [
         "//cts/tests/tests:__subpackages__",
-        "//packages/modules/AdServices/sdksandbox/tests/cts/endtoendtests"
+        "//packages/modules/AdServices/sdksandbox/tests/cts/endtoendtests",
     ],
-}
\ No newline at end of file
+}
diff --git a/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp b/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp
index e0f344010..3c17be837 100644
--- a/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp
+++ b/sdksandbox/tests/test-apps/FailingSdkProvider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -21,7 +22,7 @@ android_test_helper_app {
     defaults: ["platform_app_defaults"],
     certificate: ":sdksandbox-test",
     srcs: [
-       "src/**/*.java",
+        "src/**/*.java",
     ],
     platform_apis: true,
     min_sdk_version: "33",
diff --git a/sdksandbox/tests/test-apps/TestProvider/Android.bp b/sdksandbox/tests/test-apps/TestProvider/Android.bp
index c67f8dbe4..f1b8f5461 100644
--- a/sdksandbox/tests/test-apps/TestProvider/Android.bp
+++ b/sdksandbox/tests/test-apps/TestProvider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -34,4 +35,3 @@ android_test_helper_app {
     min_sdk_version: "33",
     target_sdk_version: "33",
 }
-
diff --git a/sdksandbox/tests/test-apps/code-provider-app/Android.bp b/sdksandbox/tests/test-apps/code-provider-app/Android.bp
index a2d5b9468..15a8ebf50 100644
--- a/sdksandbox/tests/test-apps/code-provider-app/Android.bp
+++ b/sdksandbox/tests/test-apps/code-provider-app/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -30,4 +31,3 @@ android_test_helper_app {
     min_sdk_version: "33",
     target_sdk_version: "33",
 }
-
diff --git a/sdksandbox/tests/test-apps/service-app/Android.bp b/sdksandbox/tests/test-apps/service-app/Android.bp
index bee0a1161..41b10bc16 100644
--- a/sdksandbox/tests/test-apps/service-app/Android.bp
+++ b/sdksandbox/tests/test-apps/service-app/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/testutils/Android.bp b/sdksandbox/tests/testutils/Android.bp
index 745d03657..9dd8fed9d 100644
--- a/sdksandbox/tests/testutils/Android.bp
+++ b/sdksandbox/tests/testutils/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/testutils/testscenario/example/sdk/Android.bp b/sdksandbox/tests/testutils/testscenario/example/sdk/Android.bp
index e27b941eb..1b1af6dcd 100644
--- a/sdksandbox/tests/testutils/testscenario/example/sdk/Android.bp
+++ b/sdksandbox/tests/testutils/testscenario/example/sdk/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -21,7 +22,7 @@ android_test_helper_app {
     manifest: "AndroidManifest.xml",
     certificate: ":sdksandbox-test",
     srcs: [
-       "src/**/*.java",
+        "src/**/*.java",
     ],
     static_libs: ["CtsSdkSandboxTestRunner"],
     libs: ["android.test.base"],
diff --git a/sdksandbox/tests/testutils/testscenario/example/tests/Android.bp b/sdksandbox/tests/testutils/testscenario/example/tests/Android.bp
index fb8bccc4a..e66274adf 100644
--- a/sdksandbox/tests/testutils/testscenario/example/tests/Android.bp
+++ b/sdksandbox/tests/testutils/testscenario/example/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/testutils/testscenario/testrule/Android.bp b/sdksandbox/tests/testutils/testscenario/testrule/Android.bp
index 3f78c805d..7c8f9eea4 100644
--- a/sdksandbox/tests/testutils/testscenario/testrule/Android.bp
+++ b/sdksandbox/tests/testutils/testscenario/testrule/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/testutils/testscenario/testrunner/Android.bp b/sdksandbox/tests/testutils/testscenario/testrunner/Android.bp
index fe44de0bd..185be3734 100644
--- a/sdksandbox/tests/testutils/testscenario/testrunner/Android.bp
+++ b/sdksandbox/tests/testutils/testscenario/testrunner/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/testutils/testscenario/textexecutor/Android.bp b/sdksandbox/tests/testutils/testscenario/textexecutor/Android.bp
index cc690844e..9424cf924 100644
--- a/sdksandbox/tests/testutils/testscenario/textexecutor/Android.bp
+++ b/sdksandbox/tests/testutils/testscenario/textexecutor/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -22,7 +23,6 @@ java_library {
         "src/**/*.aidl",
     ],
     visibility: [
-            "//packages/modules/AdServices/sdksandbox/tests/testutils:__subpackages__",
-        ],
+        "//packages/modules/AdServices/sdksandbox/tests/testutils:__subpackages__",
+    ],
 }
-
diff --git a/sdksandbox/tests/ui/Android.bp b/sdksandbox/tests/ui/Android.bp
index 28d6080f3..4b04b93cc 100644
--- a/sdksandbox/tests/ui/Android.bp
+++ b/sdksandbox/tests/ui/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/sdksandbox/tests/ui/provider/Android.bp b/sdksandbox/tests/ui/provider/Android.bp
index 3d2e32d3b..c2794b5a5 100644
--- a/sdksandbox/tests/ui/provider/Android.bp
+++ b/sdksandbox/tests/ui/provider/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -22,7 +23,7 @@ android_test_helper_app {
         "platform_app_defaults",
     ],
     srcs: [
-       "src/**/*.java",
+        "src/**/*.java",
     ],
     static_libs: [
         "UiProviderApi",
@@ -37,4 +38,4 @@ java_library {
     srcs: [
         "src/**/*.aidl",
     ],
-}
\ No newline at end of file
+}
diff --git a/sdksandbox/tests/unittest/Android.bp b/sdksandbox/tests/unittest/Android.bp
index a67761bd9..9a46f3290 100644
--- a/sdksandbox/tests/unittest/Android.bp
+++ b/sdksandbox/tests/unittest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_rubidium_sdk_runtime",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }