Merge changes from topic "tc_change_2305100725_22" into udc-dev am: 4ec69f0e

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



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