Don't compare FQDN with providerFriendlyName

FQDN and providor friendly name are obviously different, and if they're
compared they're almost always unmatched. FQDN of current configuration
should be checked with FQDN of new configuration.

Bug:31815374
Test: Test with the device

Change-Id: I6c8c8ca07b4abb038175e3999d387f0869ec7391

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

@@ -254,7 +254,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
 
     public boolean matches(WifiConfiguration config) {
         if (config.isPasspoint() && mConfig != null && mConfig.isPasspoint()) {
-            return config.FQDN.equals(mConfig.providerFriendlyName);
+            return config.FQDN.equals(mConfig.FQDN);
         } else {
             return ssid.equals(removeDoubleQuotes(config.SSID))
                     && security == getSecurity(config)