Merge changes from topic "am-2a41105a03a94bcf8a076377cdeb2ed3" into udc-dev...

Merge changes from topic "am-2a41105a03a94bcf8a076377cdeb2ed3" into udc-dev am: bcfcf9e3 am: 0c0d31b3

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



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