Merge changes from topic "presubmit-am-c3c04f9f7cf74427b33700c4e4562d5f" into...

Merge changes from topic "presubmit-am-c3c04f9f7cf74427b33700c4e4562d5f" into udc-dev am: 81df4f48

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



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