[automerger skipped] Merge mpr-2021-09-05 skipped: 60ffce1213

Change-Id: I9e3797498ac11519a3715477d0d6ebbcfb4c28b9
tree: 2d25e3531cb46af58da650702e39800b001cf709
  1. common/
  2. devices/
  3. .clang-format
  4. Android.bp
  5. METADATA
  6. OWNERS
  7. PREUPLOAD.cfg