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

Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: f08d7add

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



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