Merge changes from topic "am-814785583df141bcb8fc6a67ba1c7878" into udc-dev am: a069191c

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



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