Merge mpr-2021-11-05

Change-Id: I9f203b7c51abd50b25b938d062004f0bec7cce55
tree: 51503410d01f20f2790ac565bf8a590d9dc73da9
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS