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

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



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