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

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



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