am b57e1f29: Merge "Fixed missing sim card lock setup in Security Settings." into lmp-mr1-dev

* commit 'b57e1f29643e7454192973db738c13583b5c91a5':
  Fixed missing sim card lock setup in Security Settings.