More fixes to get passpoint working

Change-Id: If8639bb0fd3bdaad7ee09217a9152c1695cb9354
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 50beda7..34ae386 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -950,8 +950,7 @@
      * Identify if this configuration represents a passpoint network
      */
     public boolean isPasspoint() {
-        return TextUtils.isEmpty(SSID)
-                && !TextUtils.isEmpty(FQDN)
+        return !TextUtils.isEmpty(FQDN)
                 && !TextUtils.isEmpty(providerFriendlyName)
                 && enterpriseConfig != null
                 && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE;