Merge changes from topic "am-2311cd85895f47ffb2344416d9ff7595" into udc-dev...

Merge changes from topic "am-2311cd85895f47ffb2344416d9ff7595" into udc-dev am: 0c9025c7 am: 577a526d

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



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