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

Change-Id: I91f03a3a16731519b7c1719eb8f9d0db011b7c87