Merge changes from topic "am-348d683fc07348e39d36c8e9107adaf3" into udc-dev...

Merge changes from topic "am-348d683fc07348e39d36c8e9107adaf3" into udc-dev am: 7ef32c51 am: 5901a021

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



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