Merge s-mpr-2022-01-05

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