Merge "Update mobile network settings config package/class" into qt-dev am: 415b292a8b
am: 6b0fba9ad3

Change-Id: I53e790aeade26e00d3a2c8ef14097b1e442e6b8c