[automerger skipped] Merge UP1A.230905.019 am: 940b58e0 -s ours am: 670c946c -s ours

am skip reason: Merged-In Ia97fcb68140f537a65cfd465e1cb42799ea0f581 with SHA-1 8e39051b is already in history

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



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