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

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

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



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