Merge r-mpr-2022-01-05

Change-Id: I5f2e9fc8dc8750ae6f41b36894c757686414dcc9
tree: 6a5149c9145464e964b2979b708a3e160415bf06
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags