[automerger skipped] Merge Android 12 am: 2342573721 -s ours am: 74ae06ba8b -s ours am: a564647a66 -s ours am: 40c82a0fe1 -s ours am: 0cc3a4c0b3 -s ours

am skip reason: Merged-In I58a93835530a24f98bdbac96cd16de048bc53e6c with SHA-1 b1d1eb861d is already in history

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

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