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

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



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