am cdcbf591: Merge "Display carrier settings menu in GSM Phone if needs" into klp-dev

* commit 'cdcbf5912b3a590de8771a20b25e753e960707bf':
  Display carrier settings menu in GSM Phone if needs