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: c04e9eeb

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



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