Merge "WifiNetworkConfigBuilder: Pass package name"