Merge "Migrate Test Targets to New Android Ownership Model" into main
diff --git a/audio_utils/benchmarks/Android.bp b/audio_utils/benchmarks/Android.bp
index ee5b146..407f0bb 100644
--- a/audio_utils/benchmarks/Android.bp
+++ b/audio_utils/benchmarks/Android.bp
@@ -1,6 +1,7 @@
 // Build the benchmarks for audio_utils
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/ac3framescanner_fuzzer/Android.bp b/audio_utils/fuzz/ac3framescanner_fuzzer/Android.bp
index 11bd17b..07c38d8 100644
--- a/audio_utils/fuzz/ac3framescanner_fuzzer/Android.bp
+++ b/audio_utils/fuzz/ac3framescanner_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/audioutilsfiforeaderwriter_fuzzer/Android.bp b/audio_utils/fuzz/audioutilsfiforeaderwriter_fuzzer/Android.bp
index 8a0a637..f69c08c 100644
--- a/audio_utils/fuzz/audioutilsfiforeaderwriter_fuzzer/Android.bp
+++ b/audio_utils/fuzz/audioutilsfiforeaderwriter_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/dtsframescanner_fuzzer/Android.bp b/audio_utils/fuzz/dtsframescanner_fuzzer/Android.bp
index 59b4133..0c33001 100644
--- a/audio_utils/fuzz/dtsframescanner_fuzzer/Android.bp
+++ b/audio_utils/fuzz/dtsframescanner_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/fdtostring_fuzzer/Android.bp b/audio_utils/fuzz/fdtostring_fuzzer/Android.bp
index 954018f..bef2a9b 100644
--- a/audio_utils/fuzz/fdtostring_fuzzer/Android.bp
+++ b/audio_utils/fuzz/fdtostring_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/format_fuzzer/Android.bp b/audio_utils/fuzz/format_fuzzer/Android.bp
index 67a6f32..794ea5e 100644
--- a/audio_utils/fuzz/format_fuzzer/Android.bp
+++ b/audio_utils/fuzz/format_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/metadata_fuzzer/Android.bp b/audio_utils/fuzz/metadata_fuzzer/Android.bp
index 6b1cff7..a8a0cbf 100644
--- a/audio_utils/fuzz/metadata_fuzzer/Android.bp
+++ b/audio_utils/fuzz/metadata_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/monoblend_fuzzer/Android.bp b/audio_utils/fuzz/monoblend_fuzzer/Android.bp
index 2fc7ad0..e682bd8 100644
--- a/audio_utils/fuzz/monoblend_fuzzer/Android.bp
+++ b/audio_utils/fuzz/monoblend_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/fuzz/sndfile_fuzzer/Android.bp b/audio_utils/fuzz/sndfile_fuzzer/Android.bp
index afb85ae..3b4443e 100644
--- a/audio_utils/fuzz/sndfile_fuzzer/Android.bp
+++ b/audio_utils/fuzz/sndfile_fuzzer/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/audio_utils/tests/Android.bp b/audio_utils/tests/Android.bp
index dd587d6..9af04ac 100644
--- a/audio_utils/tests/Android.bp
+++ b/audio_utils/tests/Android.bp
@@ -1,6 +1,7 @@
 // Build the unit tests for audio_utils
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/camera/fuzz/Android.bp b/camera/fuzz/Android.bp
index 0b12b02..66c4a78 100644
--- a/camera/fuzz/Android.bp
+++ b/camera/fuzz/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_camera_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/camera/tests/Android.bp b/camera/tests/Android.bp
index e1065e7..7adf31b 100644
--- a/camera/tests/Android.bp
+++ b/camera/tests/Android.bp
@@ -1,5 +1,6 @@
 // Build the unit tests.
 package {
+    default_team: "trendy_team_camera_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":
diff --git a/tests/Android.bp b/tests/Android.bp
index 4b8e292..6583b68 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,6 +1,7 @@
 // system/audio.h utilities test
 
 package {
+    default_team: "trendy_team_android_media_audio_framework",
     // http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
     // the below license kinds from "system_media_license":