Merge "WifiNetworkSpecifierTest: Add scan retry" into rvc-dev