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

Merge changes from topic "am-ccf5d6e1de484c7091eeacf9b558bad7" into udc-dev am: 17912b07 am: b063be63

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



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