Merge "Use Widely Supported GSM Channels for NetworkScan"
am: 6f337cc82b

Change-Id: I1360079d30035bca3f63caf5cbc79b4d2932f56a