Merge "Migrate Test Targets to New Android Ownership Model" into main
diff --git a/camera2/portability/tests/Android.bp b/camera2/portability/tests/Android.bp
index d81c9bc..d7e3987 100644
--- a/camera2/portability/tests/Android.bp
+++ b/camera2/portability/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_camera_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/camera2/utils/tests/Android.bp b/camera2/utils/tests/Android.bp
index 1ef9d05..78d1ee4 100644
--- a/camera2/utils/tests/Android.bp
+++ b/camera2/utils/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_camera_framework",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/common/tests/Android.bp b/common/tests/Android.bp
index b54c899..5b68d05 100644
--- a/common/tests/Android.bp
+++ b/common/tests/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_system_ui_please_use_a_more_specific_subteam_if_possible_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }