Merge "Add multi-sim support to keyguard" into lmp-mr1-dev
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard