Merge remote-tracking branch 'origin/QCM6490.LA.3.0_T' into fp5-0324

Change-Id: Ia22476e0bf18c106206ca70100310dabcf294e45
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index d18f4cc..41d4974 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -1306,6 +1306,9 @@
             try {
                 final JSONObject keyJson = new JSONObject(string);
                 mSsid = keyJson.getString(KEY_SSID);
+                if (!TextUtils.isEmpty(mSsid) && mSsid.charAt(0) != '\"') {
+                    mSsid = "\"" + mSsid + "\"";
+                }
                 final JSONArray securityTypesJson =
                         keyJson.getJSONArray(KEY_SECURITY_TYPES);
                 for (int i = 0; i < securityTypesJson.length(); i++) {