Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp

* changes:
  [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08a8
  Keyguard - Treat messsages to lock with priority