[automerger skipped] Merge Android 12L am: b38088bc -s ours am: 412d4be0...

[automerger skipped] Merge Android 12L am: b38088bc -s ours am: 412d4be0 -s ours am: a10960bd -s ours

am skip reason: Merged-In I6cd2e61445edf190a0fff7008d154eb4fd366f21 with SHA-1 022f2d1d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2013422

Change-Id: I72885b95583d06933450c2f6921577b0d9e08de3