[automerger skipped] Ensure that we always have a useable wallpaper token for...

[automerger skipped] Ensure that we always have a useable wallpaper token for animation am: 29ee1b8f -s ours

am skip reason: Merged-In Ia971daa962beab3fd4c93215b480280a9384b380 with SHA-1 6d6cab2e is already in history

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



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