Merge changes from topic "tc_change_23042206_45" into udc-dev am: 5a2e38f2...

Merge changes from topic "tc_change_23042206_45" into udc-dev am: 5a2e38f2 am: 2ba4356d am: 4ec9d65e

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



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