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

[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 612f64b2 -s ours am: da202c9d -s ours am: 9128cce4 -s ours am: 13b96e6f -s ours

am skip reason: subject contains skip directive

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



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