Merge cherrypicks of ['googleplex-android-review.googlesource.com/39311260', 'googleplex-android-review.googlesource.com/39365965'] into 26Q2-release.

Change-Id: Ic9eb8dfb6019aff1675257230f25fb4a976b7242
tree: 66b348b9d23c87e4ff2bcc497bbb3de5f0d55288
  1. apex/
  2. flags/
  3. framework/
  4. libs/
  5. telecom/
  6. tests/
  7. .gitignore
  8. OWNERS
  9. PREUPLOAD.cfg
  10. TEST_MAPPING