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

[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 82c01c46 am: 013f20d8 -s ours am: c5c52c23 -s ours am: 00ab92d0 -s ours am: bf5e5869 -s ours am: 1564ea99 -s ours

am skip reason: subject contains skip directive

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



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