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: b3270585 am: 4b93adf3

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



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