Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475 am: 22fd3232

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



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