Merge "WifiNetworkConfigBuilder: Split into 2 separate builders"