Merge changes from topic "tc_change_2305100725_21" into udc-dev am: 207bc54d am: d32950f1

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



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