Reland: Refactor contact editor controller into its own class.

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
index 33d21543d2cc26b1b9575dbf7d12cc6b12ee389b..a98e7a00faf6faa12305eb6bd262e7fbf551616a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillContact.java
@@ -67,12 +67,12 @@ public class AutofillContact extends PaymentOption {
     public void completeContact(@Nullable String phone, @Nullable String email) {
         mIsComplete = true;
         setPhoneEmail(phone, email);
-        assert mPayerPhone != null || mPayerEmail != null;
     }
 
     private void setPhoneEmail(@Nullable String phone, @Nullable String email) {
         mPayerPhone = TextUtils.isEmpty(phone) ? null : phone;
         mPayerEmail = TextUtils.isEmpty(email) ? null : email;
+        assert mPayerPhone != null || mPayerEmail != null;
         updateLabels(mPayerPhone == null ? mPayerEmail : mPayerPhone,
                 mPayerPhone == null ? null : mPayerEmail);
     }