Merge "Remove WifiEntry.METERED_CHOICE_UNKNOWN"