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

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



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