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

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

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



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