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

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

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



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