[automerger skipped] Merge "Use Widely Supported GSM Channels for NetworkScan" into qt-dev am: d13f2667df -s ours
am: 6dbeae7709 -s ours
am skip reason: change_id Ia682f022d35c481876c49c9c8802d7c39722be0e with SHA1 2ea2a64bc7 is in history

Change-Id: I48612f90b5965d0a00ee61e4e764233852454cfc