Merge "Added WifiEntryPreference as WifiEntry version of AccessPointPreference"