[automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock...

[automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into pi-dev am: 5e2939bd -s ours am: 6a4864ee -s ours am: d9a89e47 -s ours am: 2a6c0473 -s ours am: 413b806a -s ours am: 50950b8a -s ours am: 66694f71 -s ours am: 264cc3d1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I07aa3bb4cc242ca71c854361b2e1c6b46bcd0a9e