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

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



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