[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 9f3fe75e -s ours

am skip reason: Merged-In Ie0cd5fb48727ea633b683975f6313491adc253de with SHA-1 b5a0c781 is already in history

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



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