Merge changes from topic "am-eda0d966ad2c44ed98fdb85d1555b595" into udc-dev am: 4bf08f4c

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



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