Revert of [Payments] Update autofill/payments spacings

chrome/android/java/res/values-v17/styles.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2014 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. -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Q: Why put style resources under values-v17/ ?
          A: Problem:
             1. paddingStart causes a crash on Galaxy Tab&Note b/8351339.
             2. So we wrote a build script(generate_v14_compatible_resources.py) to convert
@@ skipping 79 matching lines @@
 
     <!-- Preferences -->
     <style name="PreferencesTheme" parent="ThemeWithActionBar">
         <item name="android:textColorLink">@color/pref_accent_color</item>
         <item name="android:textAppearanceMedium">@style/PreferenceTextAppearanceMedium</item>
         <item name="android:preferenceCategoryStyle">@style/PreferenceCategory</item>
         <item name="android:spinnerItemStyle">@style/PreferenceSpinnerItem</item>
         <item name="floatLabelTextAppearance">@style/PreferenceFloatLabelTextAppearance</item>
         <item name="floatLabelPaddingLeft">@dimen/pref_autofill_field_horizontal_padding</item>
         <item name="floatLabelPaddingRight">@dimen/pref_autofill_field_horizontal_padding</item>
-        <item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_margin</item>
+        <item name="floatLabelPaddingTop">@dimen/pref_autofill_field_top_padding</item>
     </style>
     <style name="PreferenceTextAppearanceMedium">
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
     <style name="PreferenceCategory">
         <item name="android:layout">@layout/preference_category</item>
         <item name="android:shouldDisableView">false</item>
         <item name="android:selectable">false</item>
     </style>
@@ skipping 15 matching lines @@
     </style>
     <style name="PreferenceSummary">
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
     <style name="PreferenceScreenLayout">
         <item name="android:paddingTop">16dp</item>
         
         <!-- Additional padding is applied to each of the controls inside the layout, making this
              a 16dp padding overall. -->
-        <item name="android:paddingStart">@dimen/pref_autofill_content_spacing</item>
-        <item name="android:paddingEnd">@dimen/pref_autofill_content_spacing</item>
+        <item name="android:paddingStart">@dimen/pref_autofill_content_padding</item>
+        <item name="android:paddingEnd">@dimen/pref_autofill_content_padding</item>
     </style>
     <style name="PreferenceLayoutBase">
         <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
         <item name="android:paddingTop">6dp</item>
         <item name="android:paddingBottom">6dp</item>
         <item name="android:paddingStart">8dp</item>
         <item name="android:paddingEnd">8dp</item>
     </style>
     <style name="PreferenceLayout" parent="PreferenceLayoutBase" />
@@ skipping 399 matching lines @@
     <style name="ToolbarMenuButtonTablet" parent="ToolbarButton">
         <item name="android:layout_width">43dp</item>
         <item name="android:paddingEnd">3.5dp</item>
     </style>
     <style name="AppMenuItem">
         <item name="android:paddingStart">16dp</item>
         <item name="android:paddingEnd">16dp</item>
         <item name="android:background">?attr/listChoiceBackgroundIndicator</item>
     </style>
 </resources>