[automerger skipped] Merge "Fix: Block opening settings app on keyguard...

[automerger skipped] Merge "Fix: Block opening settings app on keyguard without user auth" into udc-qpr-dev am: b3878685 -s ours

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

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



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