Merge changes from topic "tc_change_23042206_35" into udc-dev am: cafdcda5...

Merge changes from topic "tc_change_23042206_35" into udc-dev am: cafdcda5 am: 3d9c0f67 am: 317bf106

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



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