Merge changes from topic "tc_change_2305100725_8" into udc-dev am: 29c8dc02 am: 4d92ad02

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



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