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

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

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



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