Merge "Add meteredOverride field to WifiConfiguration."