Revert of [Payments] Update autofill/payments spacings

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

Index: chrome/android/java/res/layout/autofill_billing_address_dropdown.xml
diff --git a/chrome/android/java/res/layout/autofill_billing_address_dropdown.xml b/chrome/android/java/res/layout/autofill_billing_address_dropdown.xml
index 943b29268872f7a3e9948b9bfb54820d40922092..47574baa103b2237c947cbe7f21fde9d98dae20c 100644
--- a/chrome/android/java/res/layout/autofill_billing_address_dropdown.xml
+++ b/chrome/android/java/res/layout/autofill_billing_address_dropdown.xml
@@ -7,10 +7,10 @@
     <TextView
         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"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
-        android:labelFor="@+id/autofill_credit_card_editor_billing_address_spinner"
+        android:focusable="true"
         android:textAppearance="@style/PreferenceFloatLabelTextAppearance"
         android:text="@string/autofill_credit_card_editor_billing_address" />
 
@@ -18,11 +18,9 @@
         android:id="@+id/autofill_credit_card_editor_billing_address_spinner"
         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"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
         android:textDirection="locale" />
 
     <View style="@style/PreferenceSpinnerUnderlineView"