Merge changes from topic 'carrier_network' into oc-mr1-dev

* changes:
  Update ScanResult with carrier network info
  Add support for maintaining carrier Wi-Fi network configurtion
tree: 347519091f4f6e646881ef6594ee16613f73bd2f
  1. service/
  2. PREUPLOAD.cfg