[automerger skipped] Merge Android 12 am: 8b5cc29efe -s ours

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

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

Change-Id: Ia8b04145fb9f83d20c4e0f0b93825b63b5a06ce8