Merge mpr-2021-06-05

Change-Id: Ibcd86576fb47bb9b0843f727a5ebaacadb636bb7
tree: 01f2a12f9edafc0c24fab9c5805fb8930e7999d4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg