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

Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp am: 65f3146e

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



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