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

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

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



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