Merge changes from topic "cherrypicker-L61600000963649159:N20600001415965012"...

Merge changes from topic "cherrypicker-L61600000963649159:N20600001415965012" into android14-tests-dev am: 87a29e9a

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



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