Revert of Refactor contact editor controller into its own class. (patchset #3 id:40001 of https://codereview.chromium.org/2092083003/ )

Reason for revert:
Hits assert on pre-L devices:

java.lang.AssertionError
  at org.chromium.chrome.browser.payments.ui.PaymentOption.updateLabels(PaymentOption.java:67)
  at org.chromium.chrome.browser.payments.AutofillContact.setPhoneEmail(AutofillContact.java:76)
  at org.chromium.chrome.browser.payments.AutofillContact.<init>(AutofillContact.java:37)
  at org.chromium.chrome.browser.payments.ContactEditor.editContact(ContactEditor.java:108)
  at org.chromium.chrome.browser.payments.PaymentRequestImpl.editContact(PaymentRequestImpl.java:625)
  at org.chromium.chrome.browser.payments.PaymentRequestImpl.onSectionAddOption(PaymentRequestImpl.java:617)
  at org.chromium.chrome.browser.payments.ui.PaymentRequestUI.onAddPaymentOption(PaymentRequestUI.java:579)
  at org.chromium.chrome.browser.payments.ui.PaymentRequestSection$OptionSection.onClick(PaymentRequestSection.java:756)
  at android.view.View.performClick(View.java:4438)

Original issue's description:
> Refactor contact editor controller into its own class.
>
> BUG=603635
>
> Committed: https://crrev.com/ed717079ed994eabfa0373635138cc23ea39622f
> Cr-Commit-Position: refs/heads/master@{#402352}

TBR=dfalcantara@chromium.org,rouslan@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=603635

Review-Url: https://codereview.chromium.org/2109573002
Cr-Commit-Position: refs/heads/master@{#402433}
6 files changed