Merge "Avoid the keyguard being a wallpaper target" into main am: 088aa3821f am: 7b713207ff

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

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