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

Change-Id: Ic8827984a446c5df20729a3bebac15a422013903