Merge "Remove IMS call logs that may leak PII" am: a8acd5c0c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397603

Change-Id: If0d9ec9ddc1139c4ae98f02446dd83873736536a

telephony/java/android/telephony/ims/ImsConferenceState.java

@@ -203,10 +203,10 @@ public final class ImsConferenceState implements Parcelable {
                     for (String key : participantData.keySet()) {
                         sb.append(key);
                         sb.append("=");
-                        if (ENDPOINT.equals(key) || USER.equals(key)) {
-                            sb.append(Rlog.pii(TAG, participantData.get(key)));
-                        } else {
+                        if (STATUS.equals(key)) {
                             sb.append(participantData.get(key));
+                        } else {
+                            sb.append(Rlog.pii(TAG, participantData.get(key)));
                         }
                         sb.append(", ");
                     }