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

Merge changes from topic "tc_change_2305100725_41" into udc-dev-plus-aosp am: eff1b524 am: f37084e8

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



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