Merge changes from topic "tc_change_23050307_31" into udc-dev am: 805ac048

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



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