[automerger skipped] Merge SP1A.210812.016 am: b1d1eb861d -s ours

am skip reason: Merged-In I7eda10afd53fba6b026d192b6bd6cb42c8e06fd2 with SHA-1 fb66b78c50 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/Permission/+/15932550

Change-Id: I9ad9b6ae9abfc1f055ee3249a91840b8afee5bff
tree: 53cd83de747afcfef3661cad72b62cedf434207d
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS