Merge cherrypicks of ['googleplex-android-review.googlesource.com/29780651', 'googleplex-android-review.googlesource.com/29910556'] into 24Q4-release.

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