[automerger skipped] Merge UP1A.230905.019 am: 940b58e0 -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: I3205188185b5862f52899365cf303de527b5a1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>