[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e7c7825213 -s ours am: 02abb0379f -s ours am: 0bc8ebe044 -s ours

am skip reason: Merged-In Ie5e87f1b20c960e81f9e1810e990e6fec8a328a1 with SHA-1 9634eceeff is already in history

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

Change-Id: Ie69b687394affb57c4599f4e05cd50aad37ca1f2
tree: 025480df01ca7a285d46fa044b17a3c278d79b5e
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS