[automerger skipped] Merge "Keyguard - Treat messsages to lock with priority"...

[automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb019 -s ours am: 2b511619 -s ours

am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c98 is already in history

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

Change-Id: Id011914db2cb57b5d567ff6ca52b1e6fdd79d9eb