Merge "Move "metered" persistence to WifiConfiguration."