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: 3c0cda39 am: 3c9067fd

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



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