Merge changes from topic "tc_change_23042206_46" into udc-dev am: 8178b081...

Merge changes from topic "tc_change_23042206_46" into udc-dev am: 8178b081 am: 905a7de6 am: c176f057

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



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