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

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

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



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