Merge changes from topic "tc_change_2305100725_15" into udc-dev am: 8fcdb78d am: 964b433d

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



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