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: 0e36f4a6 am: ecd2f93e

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



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