Merge changes from topic "tc_change_2305100725_14" into udc-dev am: 6a6e5914 am: 8c9c2c19

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



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