[Autofill] Change spacing in the local card editor, address editor (Android)

chrome/android/java/res/layout/autofill_local_card_editor.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 The Chromium Authors. All rights reserved.
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!-- Name -->
     <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout
         android:id="@+id/credit_card_name_label"
         android:labelFor="@+id/credit_card_name_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/pref_autofill_content_spacing">
+        android:layout_marginTop="@dimen/pref_autofill_field_large_top_margin"
+        android:layout_marginBottom="@dimen/pref_autofill_field_bottom_margin">
 
         <EditText
             android:id="@+id/credit_card_name_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:imeOptions="flagNoExtractUi"
             android:inputType="textCapWords"
             android:hint="@string/autofill_credit_card_editor_name" />
 
     </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout>
 
     <!-- Credit card number -->
     <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout
         android:id="@+id/credit_card_number_label"
         android:labelFor="@+id/credit_card_number_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/pref_autofill_content_spacing">
+        android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
+        android:layout_marginBottom="@dimen/pref_autofill_field_bottom_margin">
 
         <EditText
             android:id="@+id/credit_card_number_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:imeOptions="flagNoExtractUi"
             android:inputType="phone"
             android:digits="0123456789- "
             android:hint="@string/autofill_credit_card_editor_number" />
 
     </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout>
 
     <!-- Expiration date -->
     <TextView
         android:id="@+id/credit_card_expiration_label"
         android:labelFor="@+id/credit_card_expiration_month"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
         android:textAppearance="@style/PreferenceFloatLabelTextAppearance"
         android:text="@string/autofill_credit_card_editor_expiration_date" />
 
     <LinearLayout
         android:id="@+id/credit_card_expiration_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
-        android:layout_marginBottom="@dimen/pref_autofill_content_spacing"
+        android:layout_marginBottom="@dimen/pref_autofill_dropdown_bottom_margin"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
         android:orientation="horizontal"
         android:baselineAligned="false">
 
         <LinearLayout
             android:id="@+id/credit_card_expiration_month"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ skipping 20 matching lines @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
             <View style="@style/PreferenceSpinnerUnderlineView"  />
 
         </LinearLayout>
     </LinearLayout>
 
     <include layout="@layout/autofill_billing_address_dropdown" />
 </merge>