[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 rvc-dev am: 508167f7 -s ours am: cf13bbbc -s ours am: 2964f715 -s ours am: a288914d -s ours am: 4b0435e0 -s ours am: 9fa11e9a -s ours am: 3e41aa9d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id5f4c70d56ce11caebbde8f51555d106be4d0f02