Merge mpr-2021-11-05

Change-Id: I626bad111e2289bf0d75a6aca318944861e1da02
tree: d6ea0eaa0e3719fa8f5de8b21b917ff74a22ba98
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. OWNERS