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

Merge changes from topic "am-2311cd85895f47ffb2344416d9ff7595" into udc-dev am: 0c9025c7 am: 30884a90 am: cd6e1975

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



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