[automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08a8 am: 0a32838cfe -s ours

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

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

Change-Id: I2b3b095da4ba73ac58dc666d360a5d9cdc2e6290