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

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

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



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