Merge s-mpr-2021-12-05

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