Merge cherrypicks of ['googleplex-android-review.googlesource.com/30870799'] into 25Q1-release.

Change-Id: I7773ba6bb661364ddce3fec4c61d9b80f9984d16
tree: 46534bd651829728735b4bc7b1031aa54d97b14b
  1. .prebuilt_info/
  2. 1/
  3. 13/
  4. 3/
  5. 7/
  6. current/
  7. Android.bp
  8. METADATA
  9. OWNERS