Merge mpr-2021-11-05

Change-Id: I506825092c932b61ba57d49b65ba8b714cd7cad1
tree: 9df88c82f3605fdcacc6fc47b566743dd10dac74
  1. amber/
  2. Android.bp
  3. METADATA