Merge "Remove the use of new NetworkScan API in old Auto-select Network UI."