Merge changes from topic "tc_change_2305100725_19" into udc-dev am: 69435cc9 am: 706ea1b3

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



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