Merge changes Id25696e4,I939a12a2 into klp-dev

* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

@@ -837,7 +837,9 @@ public class WifiEnterpriseConfig implements Parcelable {
     public String toString() {
         StringBuffer sb = new StringBuffer();
         for (String key : mFields.keySet()) {
-            sb.append(key).append(" ").append(mFields.get(key)).append("\n");
+            // Don't display password in toString().
+            String value = PASSWORD_KEY.equals(key) ? "<removed>" : mFields.get(key);
+            sb.append(key).append(" ").append(value).append("\n");
         }
         return sb.toString();
     }