Revert of [Payments] Update autofill/payments spacings

chrome/android/java/res/layout/autofill_server_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">
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/PreferenceTitle" />
 
     <TextView
         android:id="@+id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/PreferenceSummary"
-        android:layout_marginBottom="@dimen/pref_autofill_field_top_margin" />
+        android:layout_marginBottom="@dimen/pref_autofill_field_top_padding" />
 
     <include layout="@layout/autofill_billing_address_dropdown" />
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/pref_autofill_field_top_margin">
+        android:layout_marginTop="@dimen/pref_autofill_field_top_padding">
 
         <TextView
             android:id="@+id/edit_server_card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
             android:paddingStart="@dimen/pref_autofill_touch_target_padding"
             android:paddingTop="@dimen/pref_autofill_touch_target_padding"
             android:paddingBottom="@dimen/pref_autofill_touch_target_padding"
@@ skipping 32 matching lines @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_below="@id/server_card_label"
             android:layout_toStartOf="@id/clear_local_copy"
             android:paddingTop="@dimen/pref_autofill_touch_target_padding"
             android:paddingBottom="@dimen/pref_autofill_touch_target_padding"
             style="@style/PreferenceTitle"
             android:text="@string/autofill_describe_local_copy" />
     </RelativeLayout>
 </merge>