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

Merge changes from topic "am-b81a4115f8fa4d15bcbc4e5bc8733990" into udc-qpr-dev-plus-aosp am: 0af7aa01

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



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