Merge changes from topic "tc_change_23050307_39" into udc-dev-plus-aosp am: 4940a09d am: 66ee4fd9

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



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