[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 qt-dev am: a2e320ee am: a3e4075b -s ours am: 14f6682d -s ours am: d1ec350f -s ours am: b1188369 -s ours

am skip reason: subject contains skip directive

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



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