Merge changes from topic "tc_change_23050307_29" into udc-dev am: 2bc2632e

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



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