Merge changes from topic "am-eda0d966ad2c44ed98fdb85d1555b595" into udc-dev...

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

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



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