[automerger skipped] Merge mpr-2021-09-05 skipped: ece52581d4

Change-Id: I41dc56ec4dcfcba494fbcdf33c9be61fa09626cf
tree: d4c2c25d4f2eb95010d7e84a41b2128d9973c1c4
  1. tools/
  2. Android.bp
  3. METADATA