Merge "Cancel the wallpaper animation after the tests" into udc-dev am:...

Merge "Cancel the wallpaper animation after the tests" into udc-dev am: 3b928069 am: 110db142 am: 828730e3

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



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