Merge changes from topic "tc_change_2305100725_35" into udc-dev-plus-aosp am: 5ca4e57e

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



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