Merge changes from topic "am-142d4f4f2407456e9aabb5f97eb0e9ca" into udc-dev...

Merge changes from topic "am-142d4f4f2407456e9aabb5f97eb0e9ca" into udc-dev am: d9d6622f am: ed72fecc

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



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