[automerger skipped] Merge "Narrow down the condition of wallpaper target for...

[automerger skipped] Merge "Narrow down the condition of wallpaper target for occluded keyguard" into 24D1-dev am: 64d7a085 -s ours

am skip reason: Merged-In I43a29e828798f36f39d38af130f98de7c5859ec6 with SHA-1 275e2758 is already in history

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



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