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

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