Merge "[Wi-Fi] Edit a never connected WifiEntryPreference in WifiSettings2"