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

Merge changes from topic "am-a3cf713153df49459fb772566453755a" into udc-d1-dev-plus-aosp am: 7db37d41 am: 8d2a9ba6

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



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