[automerger skipped] Add flag to guard wallpaper token transition change am: af1d87c3 -s ours

am skip reason: Merged-In Idda8e20b4362de965f6256cedff829e4bbd8ffb1 with SHA-1 6cf4a370 is already in history

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



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