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

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

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



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