[automerger skipped] Fix: Block opening settings app on keyguard without user...

[automerger skipped] Fix: Block opening settings app on keyguard without user auth am: 4eeb65a1 am: a8751acb -s ours

am skip reason: Merged-In I89d43872108710d20e0c4ef7e652d389896155d7 with SHA-1 25b34efb is already in history

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



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