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

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