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

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



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