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

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

Change-Id: I97bd981fc418a62dfed0e7fecf5b10291f3dbee6
Signed-off-by: Automerger Merge Worker <[email protected]>