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

Change-Id: I01260ad8ee6d7d97feb400476e91744767656809