[Payments] Format and validate phone number according to selected country in address editor

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
index c73f27249fda9b676fc92f2ba3bf8db9181b1b26..1b0f937e7407c4fdddb98776cfa6fcfc76944e14 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDialog.java
@@ -39,7 +39,6 @@ import android.widget.TextView;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.autofill.PhoneNumberUtil;
 import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.payments.ui.PaymentRequestUI.PaymentRequestObserverForTest;
 import org.chromium.chrome.browser.preferences.autofill.CreditCardNumberFormattingTextWatcher;
@@ -155,7 +154,6 @@ public class EditorDialog
         };
 
         mCardNumberFormatter = new CreditCardNumberFormattingTextWatcher();
-        mPhoneFormatter = new PhoneNumberUtil.FormatTextWatcher();
     }
 
     /** Prevents screenshots of this editor. */
@@ -446,6 +444,8 @@ public class EditorDialog
                 filter = mCardNumberInputFilter;
                 formatter = mCardNumberFormatter;
             } else if (fieldModel.getInputTypeHint() == EditorFieldModel.INPUT_TYPE_HINT_PHONE) {
+                mPhoneFormatter = fieldModel.getFormatter();
+                assert mPhoneFormatter != null;
                 formatter = mPhoneFormatter;
             }