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: 673d3b39 am: 93a346ec

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



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