[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 4e95f27a -s ours am: dd85d160 -s ours

am skip reason: Merged-In I42aba73107ff45d9e3eaf6042c8cf09e98f3ec7f with SHA-1 e66367ef is already in history

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



Change-Id: I6d8b4d961b8a54c48df1a74de7d66b079bd72f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>