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

Merge changes from topic "am-d3660a660b194da995f62a33a97e6a06" into udc-qpr-dev-plus-aosp am: 8809e486

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



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