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

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



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