Merge changes from topic "tc_change_2305100725_12" into udc-dev am: d7f12bc7

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



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