Merge r-mpr-2022-01-05

Change-Id: Ie99b7caee0b17195b1ff2972103655cec1e0dcb1
tree: 554ec4d149ef2f2c8466b6b9de0aa8ad37567ca6
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp