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

Change-Id: I70b2aa88f23bdf80f441e3aa4730182ed62b86c3