Merge r-mpr-2022-01-05

Change-Id: I383508e21c8d16f228cd39e1dd367ef40d6a336a
tree: 1de9b7b71ee4add95776b718044acced8f100bc7
  1. apex/
  2. Android.bp
  3. OWNERS