Merge changes from topic "tc_change_23042206_50" into udc-dev am: 1f1c5ec3

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



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