Merge "Update mobile network settings config package/class" into qt-dev am: 415b292a8b am: ff2ce66b95
am: 282a651333

Change-Id: If49c393314628581e4b36d942650a193c961804e