Merge "Migrate WifiConfiguration to use non-@hide networking APIs"