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

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



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