Merge "Support metered choice for subscription WifiEntries"