Merge r-mpr-2022-01-05

Change-Id: I41f5c807add18375805a324efa817994fb9e75ed
tree: 642246554324abac95205c2f27a6f429af71a6eb
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS