[automerger skipped] [automerged blank] Keyguard - Treat messsages to lock...

[automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c98 am: 24bedd15 -s ours am: b6785cc6 -s ours

am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf42 is already in history

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

Change-Id: I37861b22fdb553585b8a800fde6e0e5bec849494