Merge changes I7d682bd0,I8ed6a31e into udc-dev am: c9174e2f am: 7562c78d...

Merge changes I7d682bd0,I8ed6a31e into udc-dev am: c9174e2f am: 7562c78d am: a44e43da am: f14744da

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



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