am 633ba5a9: am 46b527d8: am 04cccad6: am cdcbf591: Merge "Display carrier settings menu in GSM Phone if needs" into klp-dev

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