am 794cbd70: Merge "Changed SIM lock toggle to a switch" into lmp-mr1-dev

* commit '794cbd70fa3d101b1a8a587faf327c7700c946eb':
  Changed SIM lock toggle to a switch