Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into...

Merge changes from topic "am-a5286f069992436fa3bf3e411ca3a093" into udc-qpr-dev-plus-aosp am: 136015ee

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



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