Merge changes from topic "am-af9507788a8b4331adddceb5131a255e" into tm-dev

* changes:
  [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: 9b3222c4 -s ours
  [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: 256b5f08 am: 0a32838c -s ours