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

[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 21e48cf2 -s ours am: 77d8bbe5 -s ours am: 4f48adfd -s ours am: cf1738ad -s ours am: bb147000 -s ours am: 465671c6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I21a957588f6f0010406257febf1fb54a2c9f435b