Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev...

Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev am: dc895f24 am: 237d8f25

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



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