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

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

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



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