Revert of [Payments] Add ability to bold parts of addresses

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
index 78a223cd15068c4b3f6f2d0b548e2e7b8adb5080..391a525f8b45341985de3ddaa836966e519ddc7c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java
@@ -40,8 +40,7 @@
      * @param profile The autofill profile containing the address information.
      */
     public AutofillAddress(AutofillProfile profile, boolean isComplete) {
-        super(profile.getGUID(), profile.getFullName(), profile.getLabel(),
-                profile.getPhoneNumber(), PaymentOption.NO_ICON);
+        super(profile.getGUID(), profile.getFullName(), profile.getLabel(), PaymentOption.NO_ICON);
         mProfile = profile;
         mIsComplete = isComplete;
     }
@@ -53,15 +52,14 @@
 
     /**
      * Updates the address and marks it "complete." Called after the user has edited this address.
-     * Updates the identifier and labels.
+     * Updates the identifier, label, and sublabel.
      *
      * @param profile The new profile to use.
      */
     public void completeAddress(AutofillProfile profile) {
         mProfile = profile;
         mIsComplete = true;
-        updateIdentifierAndLabels(mProfile.getGUID(), mProfile.getFullName(), mProfile.getLabel(),
-                mProfile.getPhoneNumber());
+        updateIdentifierAndLabels(mProfile.getGUID(), mProfile.getFullName(), mProfile.getLabel());
     }
 
     /** @return The country code to use, e.g., when constructing an editor for this address. */