Revert "Use Widely Supported GSM Channels for NetworkScan" am: e678690efa
am: 26bf375ca0

Change-Id: I40345c19f97a9c6b9ef1994fc6dd124ed7137386