[automerger skipped] Merge Android 12 am: 8b5cc29e -s ours am: 1ca5b309 -s...

[automerger skipped] Merge Android 12 am: 8b5cc29e -s ours am: 1ca5b309 -s ours am: 1cba02de -s ours

am skip reason: Merged-In I2c37154b68c732057cb5607034022eb61ef57a0d with SHA-1 1c67aeb1 is already in history

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

Change-Id: Ic09b254c519ea0107512c57f261f8ad38d7e8748