Merge changes from topic "tc_change_23042206_55" into udc-dev-plus-aosp am: ddcb64d8

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



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