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

Change-Id: I53ff9596e0a0669294d614332127b5c59ab8b5dc
tree: 351887093d2b611caa4d4d46a4619b7b39f5159f
  1. include/
  2. src/
  3. Android.bp
  4. NOTICE
  5. OWNERS
  6. TEST_MAPPING