[automerger skipped] Merge with history of PermissionController am: 773ed96a7a -s ours

am skip reason: Change-Id Iac716bffcb89ada25bdd59320862117b7decb281 with SHA-1 7924b77485 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea4f0019298fdfba6714bd5d9f6c84be04afb21f