Merge changes from topic "tc_change_2305100725_11" into udc-dev am: ff9c6d96

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



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