Snap for 11754915 from 19f4973434eec16a23c07b962e5c729f6d1b8544 to sdk-releasesdk-release

Change-Id: I906b2eba2d86f27a88917aba9df08748456be561

92 files changed, 197 insertions, 90 deletions

diff --git a/libraries/audio-test-harness/client-lib/Android.bp b/libraries/audio-test-harness/client-lib/Android.bp
index 8fa149474..e0d71bb0f 100644
--- a/libraries/audio-test-harness/client-lib/Android.bp
+++ b/libraries/audio-test-harness/client-lib/Android.bp
@@ -20,6 +20,7 @@
 // LIBRARIES ==============================================================
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/instrumentation/Android.bp b/libraries/audio-test-harness/instrumentation/Android.bp
index 54be1d878..746d3332d 100644
--- a/libraries/audio-test-harness/instrumentation/Android.bp
+++ b/libraries/audio-test-harness/instrumentation/Android.bp
@@ -15,6 +15,7 @@
  */
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/server/Android.bp b/libraries/audio-test-harness/server/Android.bp
index 14141656c..55a9b95c3 100644
--- a/libraries/audio-test-harness/server/Android.bp
+++ b/libraries/audio-test-harness/server/Android.bp
@@ -20,6 +20,7 @@
 // BINARIES ==============================================================
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/audio-test-harness/tradefed/Android.bp b/libraries/audio-test-harness/tradefed/Android.bp
index a1b6fe702..9ec9aaf83 100644
--- a/libraries/audio-test-harness/tradefed/Android.bp
+++ b/libraries/audio-test-harness/tradefed/Android.bp
@@ -22,6 +22,7 @@
 // java_library_host and manually copy the JAR with the Android.mk file.
 
 package {
+    default_team: "trendy_team_android_video_image_codecs",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/collectors-helper/tests/Android.bp b/libraries/collectors-helper/tests/Android.bp
index 1868b1681..b97263a7c 100644
--- a/libraries/collectors-helper/tests/Android.bp
+++ b/libraries/collectors-helper/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/compatibility-common-util/tests/Android.bp b/libraries/compatibility-common-util/tests/Android.bp
index 5f5865432..ad8769e4e 100644
--- a/libraries/compatibility-common-util/tests/Android.bp
+++ b/libraries/compatibility-common-util/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/hostsidetests/Android.bp b/libraries/device-collectors/src/hostsidetests/Android.bp
index 03f9d4344..ed0d11060 100644
--- a/libraries/device-collectors/src/hostsidetests/Android.bp
+++ b/libraries/device-collectors/src/hostsidetests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/test/java/Android.bp b/libraries/device-collectors/src/test/java/Android.bp
index 7726d35a6..023ad1d9a 100644
--- a/libraries/device-collectors/src/test/java/Android.bp
+++ b/libraries/device-collectors/src/test/java/Android.bp
@@ -16,6 +16,7 @@
 
 // Android Unit Test target
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/device-collectors/src/test/platform/Android.bp b/libraries/device-collectors/src/test/platform/Android.bp
index d4e350153..79dfbc7f2 100644
--- a/libraries/device-collectors/src/test/platform/Android.bp
+++ b/libraries/device-collectors/src/test/platform/Android.bp
@@ -16,6 +16,7 @@
 
 // Android Unit Test target
 package {
+    default_team: "trendy_team_windowing_infra_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flag-helpers/junit/test/Android.bp b/libraries/flag-helpers/junit/test/Android.bp
index 484ab30c7..11b3f8eba 100644
--- a/libraries/flag-helpers/junit/test/Android.bp
+++ b/libraries/flag-helpers/junit/test/Android.bp
@@ -14,46 +14,47 @@
  * limitations under the License.
  */
 
- package {
-     default_applicable_licenses: ["Android-Apache-2.0"],
- }
+package {
+    default_team: "trendy_team_android_core_experiments",
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
 
- android_test {
-     name: "FlagJUnitTests",
-     plugins: ["auto_annotation_plugin"],
-     srcs: ["src/**/*.java"],
-     exclude_srcs: ["src/**/host/*.java"],
-     sdk_version: "test_current",
-     static_libs: [
-         "androidx.test.rules",
-         "auto_value_annotations",
-         "flag-junit",
-         "junit",
-         "platform-test-annotations",
-     ],
-     test_config: "FlagJUnitTests.xml",
-     test_suites: [
-         "general-tests",
-     ],
- }
+android_test {
+    name: "FlagJUnitTests",
+    plugins: ["auto_annotation_plugin"],
+    srcs: ["src/**/*.java"],
+    exclude_srcs: ["src/**/host/*.java"],
+    sdk_version: "test_current",
+    static_libs: [
+        "androidx.test.rules",
+        "auto_value_annotations",
+        "flag-junit",
+        "junit",
+        "platform-test-annotations",
+    ],
+    test_config: "FlagJUnitTests.xml",
+    test_suites: [
+        "general-tests",
+    ],
+}
 
- java_test_host {
-     name: "FlagJUnitHostTests",
-     srcs: ["src/**/*.java"],
-     exclude_srcs: ["src/**/DeviceFlagsValueProviderTest.java"],
-     plugins: ["auto_annotation_plugin"],
-     static_libs: [
-         "auto_value_annotations",
-         "flag-junit-host",
-         "junit",
-         "mockito-host",
-         "objenesis",
-         "platform-test-annotations",
-     ],
-     libs: [
-         "tradefed",
-     ],
-     test_options: {
-         unit_test: true,
-     },
- }
\ No newline at end of file
+java_test_host {
+    name: "FlagJUnitHostTests",
+    srcs: ["src/**/*.java"],
+    exclude_srcs: ["src/**/DeviceFlagsValueProviderTest.java"],
+    plugins: ["auto_annotation_plugin"],
+    static_libs: [
+        "auto_value_annotations",
+        "flag-junit-host",
+        "junit",
+        "mockito-host",
+        "objenesis",
+        "platform-test-annotations",
+    ],
+    libs: [
+        "tradefed",
+    ],
+    test_options: {
+        unit_test: true,
+    },
+}
diff --git a/libraries/flag-helpers/libflagtest/Android.bp b/libraries/flag-helpers/libflagtest/Android.bp
index 12c286030..13561c9d5 100644
--- a/libraries/flag-helpers/libflagtest/Android.bp
+++ b/libraries/flag-helpers/libflagtest/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flicker/Android.bp b/libraries/flicker/Android.bp
index ad96bd8a6..90baff441 100644
--- a/libraries/flicker/Android.bp
+++ b/libraries/flicker/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_windowing_tools",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/flicker/test/Android.bp b/libraries/flicker/test/Android.bp
index 44535b0b5..4b9d61df3 100644
--- a/libraries/flicker/test/Android.bp
+++ b/libraries/flicker/test/Android.bp
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-
 package {
+    default_team: "trendy_team_windowing_tools",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -29,14 +29,14 @@ java_defaults {
     test_suites: ["device-tests"],
     libs: ["android.test.runner"],
     optimize: {
-        enabled: false
+        enabled: false,
     },
     static_libs: [
         "flickerlib",
         "flickerlib-trace_processor_shell",
         "FlickerLibTest-Utils",
         "launcher-aosp-tapl",
-        "mockito-target-extended-minus-junit4"
+        "mockito-target-extended-minus-junit4",
     ],
     data: [
         "trace_config/*",
diff --git a/libraries/health/composers/host/tests/Android.bp b/libraries/health/composers/host/tests/Android.bp
index 9f5caffa2..22ffd33b7 100644
--- a/libraries/health/composers/host/tests/Android.bp
+++ b/libraries/health/composers/host/tests/Android.bp
@@ -13,12 +13,13 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 java_library_static {
     name: "test-composers-tests",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     sdk_version: "current",
     host_supported: true,
     libs: [
diff --git a/libraries/health/composers/platform/tests/Android.bp b/libraries/health/composers/platform/tests/Android.bp
index 956e031aa..fb1fce5d2 100644
--- a/libraries/health/composers/platform/tests/Android.bp
+++ b/libraries/health/composers/platform/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -30,5 +31,5 @@ android_test {
         "guava",
         "mockito-target-minus-junit4",
     ],
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
 }
diff --git a/libraries/health/options/tests/Android.bp b/libraries/health/options/tests/Android.bp
index 8767fbaac..84911e1f6 100644
--- a/libraries/health/options/tests/Android.bp
+++ b/libraries/health/options/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -20,7 +21,7 @@ android_test {
     name: "PlatformTestOptionsTests",
     sdk_version: "30",
     min_sdk_version: "24",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     static_libs: [
         "androidx.test.runner",
         "platform-test-options",
diff --git a/libraries/health/rules/tests/Android.bp b/libraries/health/rules/tests/Android.bp
index 4807e7050..22d5568c3 100644
--- a/libraries/health/rules/tests/Android.bp
+++ b/libraries/health/rules/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -31,7 +32,7 @@ android_test {
     ],
     srcs: [
         "src/**/*.java",
-        "src/**/*.kt"
+        "src/**/*.kt",
     ],
     test_suites: ["device-tests"],
 }
diff --git a/libraries/health/runners/longevity/host/tests/Android.bp b/libraries/health/runners/longevity/host/tests/Android.bp
index ae990ab58..ac5a7cab8 100644
--- a/libraries/health/runners/longevity/host/tests/Android.bp
+++ b/libraries/health/runners/longevity/host/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/health/runners/longevity/platform/samples/Android.bp b/libraries/health/runners/longevity/platform/samples/Android.bp
index 70c9925e6..bb27ba009 100644
--- a/libraries/health/runners/longevity/platform/samples/Android.bp
+++ b/libraries/health/runners/longevity/platform/samples/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,7 +42,7 @@ java_genrule {
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
diff --git a/libraries/health/runners/longevity/platform/tests/Android.bp b/libraries/health/runners/longevity/platform/tests/Android.bp
index 4e22b2875..87e680b47 100644
--- a/libraries/health/runners/longevity/platform/tests/Android.bp
+++ b/libraries/health/runners/longevity/platform/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,7 +42,7 @@ java_genrule {
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
diff --git a/libraries/health/runners/microbenchmark/tests/Android.bp b/libraries/health/runners/microbenchmark/tests/Android.bp
index 05f368a2e..36e0dd766 100644
--- a/libraries/health/runners/microbenchmark/tests/Android.bp
+++ b/libraries/health/runners/microbenchmark/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/health/utils/tests/Android.bp b/libraries/health/utils/tests/Android.bp
index e5e2fec0f..c937cfee4 100644
--- a/libraries/health/utils/tests/Android.bp
+++ b/libraries/health/utils/tests/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/metrics-helper/tests/Android.bp b/libraries/metrics-helper/tests/Android.bp
index b9b7071d3..31f939466 100644
--- a/libraries/metrics-helper/tests/Android.bp
+++ b/libraries/metrics-helper/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/power-helper/sample/Android.bp b/libraries/power-helper/sample/Android.bp
index 56dfcc917..e73f62633 100644
--- a/libraries/power-helper/sample/Android.bp
+++ b/libraries/power-helper/sample/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/libraries/screenshot/Android.bp b/libraries/screenshot/Android.bp
index a9b515d3d..440b54f5a 100644
--- a/libraries/screenshot/Android.bp
+++ b/libraries/screenshot/Android.bp
@@ -14,6 +14,7 @@
 //
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -22,7 +23,7 @@ android_test {
     manifest: "src/androidTest/manifest/AndroidManifest.xml",
     platform_apis: true,
     optimize: {
-        enabled: false
+        enabled: false,
     },
     srcs: [
         "src/**/*.java",
@@ -49,9 +50,11 @@ android_library {
     name: "platform-screenshot-diff-core",
     manifest: "AndroidManifest.xml",
     platform_apis: true,
-    lint: { test: true },
+    lint: {
+        test: true,
+    },
     optimize: {
-        enabled: false
+        enabled: false,
     },
     srcs: [
         "src/main/java/platform/test/screenshot/**/*.java",
@@ -75,6 +78,6 @@ java_library {
         "**/*.proto",
     ],
     optimize: {
-        enabled: false
-    }
+        enabled: false,
+    },
 }
diff --git a/libraries/screenshot/deviceless/layoutlib/tests/Android.bp b/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
index a772a65eb..d360f6dfc 100644
--- a/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
+++ b/libraries/screenshot/deviceless/layoutlib/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -42,4 +43,3 @@ java_test_host {
 
     required: ["layoutlib"],
 }
-
diff --git a/robolab/roboStandaloneProj/tests/Android.bp b/robolab/roboStandaloneProj/tests/Android.bp
index cc570011e..337dbf50c 100644
--- a/robolab/roboStandaloneProj/tests/Android.bp
+++ b/robolab/roboStandaloneProj/tests/Android.bp
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/scripts/perf-setup/tests/Android.bp b/scripts/perf-setup/tests/Android.bp
index 25de1d3e7..5de8cf06e 100644
--- a/scripts/perf-setup/tests/Android.bp
+++ b/scripts/perf-setup/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_performance",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/apphealth/scenarios/tests/Android.bp b/tests/apphealth/scenarios/tests/Android.bp
index 5b424e560..43ef77392 100644
--- a/tests/apphealth/scenarios/tests/Android.bp
+++ b/tests/apphealth/scenarios/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/appgrid/Android.bp b/tests/automotive/functional/appgrid/Android.bp
index 4b3e077bf..dc7ff6f3d 100644
--- a/tests/automotive/functional/appgrid/Android.bp
+++ b/tests/automotive/functional/appgrid/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/dialer/Android.bp b/tests/automotive/functional/dialer/Android.bp
index 1b5ed8ee3..e629ea21f 100644
--- a/tests/automotive/functional/dialer/Android.bp
+++ b/tests/automotive/functional/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/home/Android.bp b/tests/automotive/functional/home/Android.bp
index 126fd608b..f6f2e5851 100644
--- a/tests/automotive/functional/home/Android.bp
+++ b/tests/automotive/functional/home/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/locationstatusbar/Android.bp b/tests/automotive/functional/locationstatusbar/Android.bp
index ebc9d550d..687316387 100644
--- a/tests/automotive/functional/locationstatusbar/Android.bp
+++ b/tests/automotive/functional/locationstatusbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/lockscreen/Android.bp b/tests/automotive/functional/lockscreen/Android.bp
index 6d741e4d2..39b7ebcea 100644
--- a/tests/automotive/functional/lockscreen/Android.bp
+++ b/tests/automotive/functional/lockscreen/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/mediacenter/Android.bp b/tests/automotive/functional/mediacenter/Android.bp
index 20e0f283b..6e5778333 100644
--- a/tests/automotive/functional/mediacenter/Android.bp
+++ b/tests/automotive/functional/mediacenter/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/multiuser/Android.bp b/tests/automotive/functional/multiuser/Android.bp
index 97bdcf9af..cbfb7570b 100644
--- a/tests/automotive/functional/multiuser/Android.bp
+++ b/tests/automotive/functional/multiuser/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/navigationbar/Android.bp b/tests/automotive/functional/navigationbar/Android.bp
index e5913c7bd..1e0ba8094 100644
--- a/tests/automotive/functional/navigationbar/Android.bp
+++ b/tests/automotive/functional/navigationbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/notifications/Android.bp b/tests/automotive/functional/notifications/Android.bp
index 7b76ea411..27ef7c69f 100644
--- a/tests/automotive/functional/notifications/Android.bp
+++ b/tests/automotive/functional/notifications/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/profileicon/Android.bp b/tests/automotive/functional/profileicon/Android.bp
index 888194656..15e3b0a8e 100644
--- a/tests/automotive/functional/profileicon/Android.bp
+++ b/tests/automotive/functional/profileicon/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -38,8 +39,8 @@ android_test {
         "longevity-device-lib",
         "platform-test-junit-rules",
     ],
-     srcs: ["src/**/*.java"],
-        certificate: "platform",
-        test_suites: ["catbox"],
-        privileged: true,
+    srcs: ["src/**/*.java"],
+    certificate: "platform",
+    test_suites: ["catbox"],
+    privileged: true,
 }
diff --git a/tests/automotive/functional/profileiconlist/Android.bp b/tests/automotive/functional/profileiconlist/Android.bp
index 38e3d4600..c28db1eb0 100644
--- a/tests/automotive/functional/profileiconlist/Android.bp
+++ b/tests/automotive/functional/profileiconlist/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/settings/Android.bp b/tests/automotive/functional/settings/Android.bp
index 1a9234421..371c1a1fd 100644
--- a/tests/automotive/functional/settings/Android.bp
+++ b/tests/automotive/functional/settings/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/functional/statusbar/Android.bp b/tests/automotive/functional/statusbar/Android.bp
index dfd153da7..dc4e52337 100644
--- a/tests/automotive/functional/statusbar/Android.bp
+++ b/tests/automotive/functional/statusbar/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -42,4 +43,3 @@ android_test {
         "automotive-tests",
     ],
 }
-
diff --git a/tests/automotive/functional/uxrestriction/Android.bp b/tests/automotive/functional/uxrestriction/Android.bp
index 1479e2446..4d4b09d5d 100644
--- a/tests/automotive/functional/uxrestriction/Android.bp
+++ b/tests/automotive/functional/uxrestriction/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/appgrid/tests/Android.bp b/tests/automotive/health/appgrid/tests/Android.bp
index ae5a377e4..5eae4b28a 100644
--- a/tests/automotive/health/appgrid/tests/Android.bp
+++ b/tests/automotive/health/appgrid/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/dial/tests/Android.bp b/tests/automotive/health/dial/tests/Android.bp
index 497f8656f..6d6be80c2 100644
--- a/tests/automotive/health/dial/tests/Android.bp
+++ b/tests/automotive/health/dial/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/mediacenter/tests/Android.bp b/tests/automotive/health/mediacenter/tests/Android.bp
index e9ddf15d1..fa90aa33d 100644
--- a/tests/automotive/health/mediacenter/tests/Android.bp
+++ b/tests/automotive/health/mediacenter/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/multiuser/tests/Android.bp b/tests/automotive/health/multiuser/tests/Android.bp
index 3be54b4e8..971db7da9 100644
--- a/tests/automotive/health/multiuser/tests/Android.bp
+++ b/tests/automotive/health/multiuser/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,6 +42,9 @@ android_test {
     ],
     srcs: ["src/**/*.java"],
     certificate: "platform",
-    test_suites: ["catbox", "ats"],
+    test_suites: [
+        "catbox",
+        "ats",
+    ],
     privileged: true,
 }
diff --git a/tests/automotive/health/notification/tests/Android.bp b/tests/automotive/health/notification/tests/Android.bp
index f041ebc9c..01a914f5a 100644
--- a/tests/automotive/health/notification/tests/Android.bp
+++ b/tests/automotive/health/notification/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/health/settings/tests/Android.bp b/tests/automotive/health/settings/tests/Android.bp
index 0f102f5b0..1ed8b0fba 100644
--- a/tests/automotive/health/settings/tests/Android.bp
+++ b/tests/automotive/health/settings/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/bluetooth_palette/Android.bp b/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
index 2abbbbf0b..d8c9a4513 100644
--- a/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
+++ b/tests/automotive/mobly_tests/bluetooth_palette/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/connectivity/Android.bp b/tests/automotive/mobly_tests/connectivity/Android.bp
index fa3390335..6b6892f1f 100644
--- a/tests/automotive/mobly_tests/connectivity/Android.bp
+++ b/tests/automotive/mobly_tests/connectivity/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/dialer/Android.bp b/tests/automotive/mobly_tests/dialer/Android.bp
index 63be1de05..be39c3018 100644
--- a/tests/automotive/mobly_tests/dialer/Android.bp
+++ b/tests/automotive/mobly_tests/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/media/Android.bp b/tests/automotive/mobly_tests/media/Android.bp
index cee1205c6..77f7cb0de 100644
--- a/tests/automotive/mobly_tests/media/Android.bp
+++ b/tests/automotive/mobly_tests/media/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/mobly_tests/pairing/Android.bp b/tests/automotive/mobly_tests/pairing/Android.bp
index 2c6949882..d6236155c 100644
--- a/tests/automotive/mobly_tests/pairing/Android.bp
+++ b/tests/automotive/mobly_tests/pairing/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/automotive/snippets/phone/Android.bp b/tests/automotive/snippets/phone/Android.bp
index 4b828c85a..350cf05ea 100644
--- a/tests/automotive/snippets/phone/Android.bp
+++ b/tests/automotive/snippets/phone/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_aaos_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/bettertogether/quickstart/performance_test/Android.bp b/tests/bettertogether/quickstart/performance_test/Android.bp
index 9d4d3d1f4..7859456f1 100644
--- a/tests/bettertogether/quickstart/performance_test/Android.bp
+++ b/tests/bettertogether/quickstart/performance_test/Android.bp
@@ -13,17 +13,18 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_fwk_uwb",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_defaults {
-  name: "quick_start_perf_test_defaults",
-  pkg_path: "performance_test",
+    name: "quick_start_perf_test_defaults",
+    pkg_path: "performance_test",
 }
 
 python_library_host {
     name: "nc_constants",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nc_constants.py",
     ],
@@ -33,7 +34,7 @@ python_library_host {
 
 python_library_host {
     name: "gms_auto_updates_util",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "gms_auto_updates_util.py",
     ],
@@ -44,7 +45,7 @@ python_library_host {
 
 python_library_host {
     name: "setup_utils",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "setup_utils.py",
     ],
@@ -57,7 +58,7 @@ python_library_host {
 
 python_library_host {
     name: "nc_base_test",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nc_base_test.py",
     ],
@@ -70,7 +71,7 @@ python_library_host {
 
 python_library_host {
     name: "nearby_connection_wrapper",
-    defaults: ["quick_start_perf_test_defaults",],
+    defaults: ["quick_start_perf_test_defaults"],
     srcs: [
         "nearby_connection_wrapper.py",
     ],
@@ -84,24 +85,26 @@ python_library_host {
 python_test_host {
     name: "quick_start_stress_test",
     main: "quick_start_stress_test.py",
-    srcs: ["quick_start_stress_test.py",],
+    srcs: ["quick_start_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
         // This tag is used to enable the ATest Mobly runner
-      	tags: ["mobly"],
+        tags: ["mobly"],
     },
     data: [
         "local_dev_testbed.yml",
         // package the snippes for atest
         ":nearby_snippet",
-        ":nearby_snippet_2",],
+        ":nearby_snippet_2",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
@@ -112,13 +115,14 @@ python_test_host {
 python_test_host {
     name: "esim_transfer_stress_test",
     main: "esim_transfer_stress_test.py",
-    srcs: ["esim_transfer_stress_test.py",],
+    srcs: ["esim_transfer_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
@@ -128,7 +132,8 @@ python_test_host {
     data: [
         "local_esim_testbed.yml",
         // package the snippes for atest
-        ":nearby_snippet",],
+        ":nearby_snippet",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
@@ -139,13 +144,14 @@ python_test_host {
 python_test_host {
     name: "nearby_share_stress_test",
     main: "nearby_share_stress_test.py",
-    srcs: ["nearby_share_stress_test.py",],
+    srcs: ["nearby_share_stress_test.py"],
     libs: [
         "nc_constants",
         "setup_utils",
         "nearby_connection_wrapper",
         "nc_base_test",
-        "mobly",],
+        "mobly",
+    ],
     test_suites: [],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
@@ -155,7 +161,8 @@ python_test_host {
     data: [
         "local_nearby_share_testbed.yml",
         // package the snippes for atest
-        ":nearby_snippet",],
+        ":nearby_snippet",
+    ],
     version: {
         py3: {
             embedded_launcher: false,
diff --git a/tests/codecoverage/hosttest/Android.bp b/tests/codecoverage/hosttest/Android.bp
index 584c710be..ee88ebb28 100644
--- a/tests/codecoverage/hosttest/Android.bp
+++ b/tests/codecoverage/hosttest/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/instrumentation/Android.bp b/tests/codecoverage/instrumentation/Android.bp
index 99e13d082..8fae51ff7 100644
--- a/tests/codecoverage/instrumentation/Android.bp
+++ b/tests/codecoverage/instrumentation/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/native/cpp/Android.bp b/tests/codecoverage/native/cpp/Android.bp
index 5f0817722..e07267320 100644
--- a/tests/codecoverage/native/cpp/Android.bp
+++ b/tests/codecoverage/native/cpp/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_llvm_and_toolchains",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/codecoverage/native/rust/Android.bp b/tests/codecoverage/native/rust/Android.bp
index 94d78a670..de4038842 100644
--- a/tests/codecoverage/native/rust/Android.bp
+++ b/tests/codecoverage/native/rust/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_llvm_and_toolchains",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/instrumentation/Android.bp b/tests/example/instrumentation/Android.bp
index e1bfeb0e4..65006a4a2 100644
--- a/tests/example/instrumentation/Android.bp
+++ b/tests/example/instrumentation/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_performance",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -29,7 +30,7 @@ android_test {
     test_config: "configs/hello-world.xml",
 
     test_options: {
-        extra_test_configs: ["configs/hallo-welt.xml",],
+        extra_test_configs: ["configs/hallo-welt.xml"],
     },
 
     test_suites: ["device-tests"],
diff --git a/tests/example/jarhosttest/Android.bp b/tests/example/jarhosttest/Android.bp
index 2df7dbe8f..49f7de492 100644
--- a/tests/example/jarhosttest/Android.bp
+++ b/tests/example/jarhosttest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pesto",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/mobly/Android.bp b/tests/example/mobly/Android.bp
index 6bdc7ad19..0207b821b 100644
--- a/tests/example/mobly/Android.bp
+++ b/tests/example/mobly/Android.bp
@@ -13,14 +13,15 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_test_host {
     name: "mobly-hello-world-test",
     main: "hello_world_test.py",
-    srcs: ["hello_world_test.py",],
-    libs: ["mobly",],
+    srcs: ["hello_world_test.py"],
+    libs: ["mobly"],
     test_suites: ["general-tests"],
     test_options: {
         unit_test: false, // as Mobly tests require device(s)
diff --git a/tests/example/mobly_multidevice/Android.bp b/tests/example/mobly_multidevice/Android.bp
index 90a3b82b7..f2110a111 100644
--- a/tests/example/mobly_multidevice/Android.bp
+++ b/tests/example/mobly_multidevice/Android.bp
@@ -13,13 +13,14 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 python_test_host {
     name: "mobly-multidevice-test",
     main: "multidevice_test.py",
-    srcs: ["multidevice_test.py",],
+    srcs: ["multidevice_test.py"],
     test_suites: ["general-tests"],
     test_options: {
         unit_test: false,
diff --git a/tests/example/native/Android.bp b/tests/example/native/Android.bp
index ef34c8645..9de8bc849 100644
--- a/tests/example/native/Android.bp
+++ b/tests/example/native/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_tooltopia",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/parameterized_test/Android.bp b/tests/example/parameterized_test/Android.bp
index 36dc6fc04..98b000dc3 100644
--- a/tests/example/parameterized_test/Android.bp
+++ b/tests/example/parameterized_test/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_pesto",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -25,4 +26,4 @@ android_test {
 
     static_libs: ["androidx.test.runner"],
     certificate: "platform",
-}
\ No newline at end of file
+}
diff --git a/tests/example/perf/Android.bp b/tests/example/perf/Android.bp
index 25210e7b8..1256468c1 100644
--- a/tests/example/perf/Android.bp
+++ b/tests/example/perf/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/example/stubtest/Android.bp b/tests/example/stubtest/Android.bp
index aa271e171..d3275dfe6 100644
--- a/tests/example/stubtest/Android.bp
+++ b/tests/example/stubtest/Android.bp
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_team: "trendy_team_testing",
+}
+
 java_test_host {
     name: "DeviceLongPollingStubTest",
     srcs: ["src/**/*.java"],
diff --git a/tests/functional/devicehealthchecks/Android.bp b/tests/functional/devicehealthchecks/Android.bp
index a9ddc2edd..4c82742c2 100644
--- a/tests/functional/devicehealthchecks/Android.bp
+++ b/tests/functional/devicehealthchecks/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/overviewtests/Android.bp b/tests/functional/overviewtests/Android.bp
index fe7637cee..f6f7c7e53 100644
--- a/tests/functional/overviewtests/Android.bp
+++ b/tests/functional/overviewtests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_build",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/permission/Android.bp b/tests/functional/permission/Android.bp
index 0c8281f8a..4f249ec6a 100644
--- a/tests/functional/permission/Android.bp
+++ b/tests/functional/permission/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_camera_app",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/functional/testapks/applinktestapp/Android.bp b/tests/functional/testapks/applinktestapp/Android.bp
index 1f83b2322..b98e19717 100644
--- a/tests/functional/testapks/applinktestapp/Android.bp
+++ b/tests/functional/testapks/applinktestapp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_permissions",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/health/scenarios/tests/Android.bp b/tests/health/scenarios/tests/Android.bp
index 0e27a2347..24fca27f7 100644
--- a/tests/health/scenarios/tests/Android.bp
+++ b/tests/health/scenarios/tests/Android.bp
@@ -15,6 +15,7 @@
 // TODO(harrytczhang@): Refactor to share command with the similar genrule in samples. See
 // b/119635583 for similar bug.
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -41,14 +42,14 @@ java_genrule {
         "&& if ! ($(location aprotoc) --encode=longevity.profile.Configuration " +
         "$(location :profile-proto-def) < $$file > " +
         "$$out_dir/$$assets_dir/$${fname//.textpb/.pb}) ; then " +
-        "echo \"\033[0;31mFailed to parse profile $$file. See above for errors.\033[0m\" " +
+        "echo \"\x1b[0;31mFailed to parse profile $$file. See above for errors.\x1b[0m\" " +
         "&& exit 1 ; fi ; done && jar cf $(out) -C $$(dirname $(out)) $$assets_dir",
 }
 
 java_library_static {
     name: "common-platform-scenario-tests",
     sdk_version: "test_current",
-    srcs: [ "src/**/*.java" ],
+    srcs: ["src/**/*.java"],
     libs: [
         "common-platform-scenarios",
         "guava",
diff --git a/tests/jank/UbSystemUiJankTests/Android.bp b/tests/jank/UbSystemUiJankTests/Android.bp
index 44f217012..9a05e9f19 100644
--- a/tests/jank/UbSystemUiJankTests/Android.bp
+++ b/tests/jank/UbSystemUiJankTests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_gesture_nav",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/androidtvjanktests/Android.bp b/tests/jank/androidtvjanktests/Android.bp
index a59614b94..eb8082b3e 100644
--- a/tests/jank/androidtvjanktests/Android.bp
+++ b/tests/jank/androidtvjanktests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/dialer/Android.bp b/tests/jank/dialer/Android.bp
index b93363645..0f46e9cd0 100644
--- a/tests/jank/dialer/Android.bp
+++ b/tests/jank/dialer/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/jankmicrobenchmark/Android.bp b/tests/jank/jankmicrobenchmark/Android.bp
index 715b494c5..91a3749ee 100644
--- a/tests/jank/jankmicrobenchmark/Android.bp
+++ b/tests/jank/jankmicrobenchmark/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/sysapp_wear/Android.bp b/tests/jank/sysapp_wear/Android.bp
index f6b052442..bd491436a 100644
--- a/tests/jank/sysapp_wear/Android.bp
+++ b/tests/jank/sysapp_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/touch_latency_wear/Android.bp b/tests/jank/touch_latency_wear/Android.bp
index 1fb20a51b..3069f3709 100644
--- a/tests/jank/touch_latency_wear/Android.bp
+++ b/tests/jank/touch_latency_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/uibench/Android.bp b/tests/jank/uibench/Android.bp
index 39c61e313..16912c6cb 100644
--- a/tests/jank/uibench/Android.bp
+++ b/tests/jank/uibench/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/uibench_wear/Android.bp b/tests/jank/uibench_wear/Android.bp
index 027425888..89c350968 100644
--- a/tests/jank/uibench_wear/Android.bp
+++ b/tests/jank/uibench_wear/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/jank/webview/Android.bp b/tests/jank/webview/Android.bp
index c438d2526..32a406fd8 100644
--- a/tests/jank/webview/Android.bp
+++ b/tests/jank/webview/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_testing_experiences",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/microbenchmarks/LauncherIconsApp/Android.bp b/tests/microbenchmarks/LauncherIconsApp/Android.bp
index e713b6e01..9d80dfc57 100644
--- a/tests/microbenchmarks/LauncherIconsApp/Android.bp
+++ b/tests/microbenchmarks/LauncherIconsApp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/microbenchmarks/uibench/Android.bp b/tests/microbenchmarks/uibench/Android.bp
index 4bc93c739..4d8667f7a 100644
--- a/tests/microbenchmarks/uibench/Android.bp
+++ b/tests/microbenchmarks/uibench/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -30,16 +31,20 @@ android_test {
 
     libs: ["android.test.base.stubs"],
 
-    data: [":perfetto_artifacts",
-           ":UiBench",],
+    data: [
+        ":perfetto_artifacts",
+        ":UiBench",
+    ],
 
     sdk_version: "test_current",
 
     test_config: "configs/uibench-all.xml",
 
     test_options: {
-        extra_test_configs: ["configs/uibench-dialoglist.xml",
-                             "configs/uibench-invalidate.xml",],
+        extra_test_configs: [
+            "configs/uibench-dialoglist.xml",
+            "configs/uibench-invalidate.xml",
+        ],
     },
 
     test_suites: ["device-tests"],
diff --git a/tests/perf/BootHelperApp/Android.bp b/tests/perf/BootHelperApp/Android.bp
index 6d5642cc9..7f6b10ee2 100644
--- a/tests/perf/BootHelperApp/Android.bp
+++ b/tests/perf/BootHelperApp/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerfTransitionTest/Android.bp b/tests/perf/PerfTransitionTest/Android.bp
index d5f7b22b7..6dcecb7a8 100644
--- a/tests/perf/PerfTransitionTest/Android.bp
+++ b/tests/perf/PerfTransitionTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_platform_build",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerformanceAppTest/Android.bp b/tests/perf/PerformanceAppTest/Android.bp
index 8d9a091a4..cd9667a33 100644
--- a/tests/perf/PerformanceAppTest/Android.bp
+++ b/tests/perf/PerformanceAppTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PerformanceLaunch/Android.bp b/tests/perf/PerformanceLaunch/Android.bp
index c014dc4b6..fc5aac97e 100644
--- a/tests/perf/PerformanceLaunch/Android.bp
+++ b/tests/perf/PerformanceLaunch/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_launcher",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/tests/perf/PowerPerfTest/Android.bp b/tests/perf/PowerPerfTest/Android.bp
index 3a159b903..f442a5200 100644
--- a/tests/perf/PowerPerfTest/Android.bp
+++ b/tests/perf/PowerPerfTest/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/esimutility/Android.bp b/utils/esimutility/Android.bp
index a34478aef..e449680de 100644
--- a/utils/esimutility/Android.bp
+++ b/utils/esimutility/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/permissions/Android.bp b/utils/permissions/Android.bp
index f80da00d9..270e7b855 100644
--- a/utils/permissions/Android.bp
+++ b/utils/permissions/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_testing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/utils/wifistrengthscanner/Android.bp b/utils/wifistrengthscanner/Android.bp
index 2439221c9..9a483f942 100644
--- a/utils/wifistrengthscanner/Android.bp
+++ b/utils/wifistrengthscanner/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_test_eng_comms_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }