[automerger skipped] Merge mpr-2021-09-05 skipped: bb0950c021

Change-Id: Idd89cbb24c50d2bd58208b2d78612b9ef3aeb0b0
tree: 1c9ef987f3cffdcef7f394efce1e173bd47fff72
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags