Merge "WifiManager: startScan throttling"