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

Change-Id: Ieac13eb536f57a5438e9909b7f2b1cb7ad90435c