[automerger skipped] When wallpaper target is under keyguard, use keyguard am: 6f24f35f -s ours

am skip reason: Merged-In Iaa631b75d5bc24444bd7c808e0aa056620edcc4b with SHA-1 719144b3 is already in history

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



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