Merge mpr-2021-06-05

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