Merge "Revert "WifiManager: Return status from startScan()"" into pi-dev