Snap for 13256841 from 35d362c8c48414aa0e6e2ec895a01024f6d1e65c to 25Q2-release

Change-Id: I7dd6d485795075c0f5dd69498f791c2af145be7d

OWNERS

diff --git a/OWNERS b/OWNERS
index 730ec27..6808978 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,6 @@
-adelva@google.com
-balsini@google.com
+# Bug component: 391836
 edliaw@google.com
 bettyzhou@google.com
+adelva@google.com
+balsini@google.com
 include platform/system/core:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}

android/Android.bp

diff --git a/android/Android.bp b/android/Android.bp
index bdf9461..9f5f62a 100644
--- a/android/Android.bp
+++ b/android/Android.bp
@@ -15,6 +15,8 @@
 
 package {
     default_applicable_licenses: ["external_ltp_license"],
+    default_team: "trendy_team_android_kernel",
+
 }
 
 LTP_TESTS = [