[automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c98 2p: dde281c5

Blank merge reason: parent was merged -s ours

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

Bug: 151095871
Change-Id: I4c382cbabb60c54b235d3a169639e6af96247ea9
Merged-In: I7585a0a5eeb308e0e32a4f77f581556d883b5cda