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

Merge changes from topic "am-fcae4340eed244c58cf97f06f2a1e30e" into udc-dev am: 228a0071 am: 65422f52

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



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