Merge changes from topic "tc_change_2305100725_35" into udc-dev-plus-aosp am:...

Merge changes from topic "tc_change_2305100725_35" into udc-dev-plus-aosp am: 5ca4e57e am: e5d9c90a

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



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