[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 skip reason: subject contains skip directive

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

Change-Id: I7d96242db723bd36a9e393ff50a1f5be94e0b741