Merge changes from topic "tc_change_2305100725_11" into udc-dev am: ff9c6d96 am: b81c5650

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



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