Merge r-mpr-2022-01-05

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