Merge changes from topic "tc_change_23050307_41" into udc-dev-plus-aosp am: 5ec5b7b6 am: ac3878d9

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



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