Merge "Refine the check restriction function in WifiEntryPreference"