Merge mpr-2021-06-05

Change-Id: I8c59adb022a6e5689018e4900671e1dd6166f446
tree: b1307a50a385eeabda52ec420d1ddc2a2855630c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg