[automerger skipped] Merge "When wallpaper target is under keyguard, use...

[automerger skipped] Merge "When wallpaper target is under keyguard, use keyguard" into 24D1-dev am: f66e6fc5 -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: I438bec14c1e9d9a524f4c47f24a9c3623726e217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>