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

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