Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: I3d1adcdbd8c83f278969072cf1efcd68e1b5f27d
Change-Id: Ib971cea2691b405d7f2cd472401dda952074371b

Android.bp

diff --git a/Android.bp b/Android.bp
index d6d3397..f0a7b19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -151,6 +151,7 @@
         "libprotobuf-cpp-lite",
         "libz",
     ],
+    apex_available: ["//apex_available:platform"],
 }
 
 // TODO(cassiewang): Add build rules and a TEST_MAPPING for cc_tests

OWNERS

diff --git a/OWNERS b/OWNERS
index 93c8e30..b3f15f8 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
 adorokhine@google.com
 tjbarron@google.com
+include platform/system/core:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}