[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L61600000963649159:N20600001415965012" into android14-tests-dev am: 87a29e9a am: c816667a -s ours am: 7954a315 -s ours

am skip reason: Merged-In If16b2e93f9158767e7d6fb8a82d30a87a12e6595 with SHA-1 a72037fb is already in history

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



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