[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am:...

[automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 0a5599a6 -s ours am: f93ca2cd -s ours am: 5d56bedd -s ours am: 361f49ae -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: I0b6bb5788f4a1e0e1b14b89d7bead5c52beb19ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>