Merge changes from topic "tc_change_2305100725_20" into udc-dev am: 188d9963 am: ec97dde1

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



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