Merge changes from topic "am-ddb5311c68fa48239f4d4ff72503ba5c" into udc-dev...

Merge changes from topic "am-ddb5311c68fa48239f4d4ff72503ba5c" into udc-dev am: b4a610d0 am: 5dda7c30 am: 53b5c25c am: 6828b08a

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



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