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

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

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



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