Fixed with above change, requesting merge.

Manually approving this because auto script would wait for another 24hrs from the last merge request comment. (The auto merge approval script was trying to look for Merge-Request-57 label in comments, however, this one had the label in issue description.)

Copy/paste the approval comment here:

Your change meets the bar and is auto-approved for M57. Please go ahead and merge the CL to branch 2987 manually. Please contact milestone owner if you have questions.
Owners: amineer@(clank), cmasso@(bling), ketakid@(cros), govind@(desktop)

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134

commit c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134
Author: csashi <csashi@google.com>
Date: Mon Jan 30 19:50:34 2017

[Merge M57] Uses uniform margin for icon, label and sublabel in order to
make all of the green distances here equal to the orange distance in
the picture below:
https://drive.google.com/file/d/0B1qGSlvsjCymNVE1eGJVWW40TWM/view?usp=sharing

New layout for credit card after this change:
https://drive.google.com/file/d/0B1qGSlvsjCymMGxWUkI5aThVNFU/view?usp=sharing

New layout for user name and address that uses same margin as for expanded credit card popup layout.
https://screenshot.googleplex.com/HoJLy2bT2BO.png

NOTRY=true
NOPRESUBMIT=true
TBR=sgurun@chromium.org
BUG= 686287 

Review-Url: https://codereview.chromium.org/2665433002
Cr-Commit-Position: refs/branch-heads/2987@{#174}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}

[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/browser/about_flags.cc
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/chrome/browser/ui/autofill/autofill_popup_layout_model.h
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/components/autofill/android/java/src/org/chromium/components/autofill/AutofillPopup.java
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/components/autofill/core/browser/autofill_experiments.cc
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/components/autofill/core/browser/autofill_experiments.h
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/ui/android/java/res/layout/dropdown_item.xml
[modify] https://crrev.com/c26ca96a8e1b6ffdcc68b67ea09e0d0cff0b7134/ui/android/java/src/org/chromium/ui/DropdownAdapter.java