Merge changes from topic "tc_change_2305100725_12" into udc-dev am: d7f12bc7 am: d8d05a01

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23124510



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