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

Change-Id: Ia9e8517d7550d1eb15241719c80a568b340c67b2
tree: aa637331b576bd2226411546b58793e04cc35019
  1. apex/
  2. framework/
  3. service/
  4. OWNERS
  5. TEST_MAPPING