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

[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 51c5dae6 -s ours am: 2d7c67b6 -s ours am: d72736e0 -s ours am: 17c6a643 -s ours am: fbcc3f3f -s ours

am skip reason: subject contains skip directive

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



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