Add billing address to masked server credit cards.

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

Index: chrome/android/java/res/layout/autofill_server_card_editor.xml
diff --git a/chrome/android/java/res/layout/autofill_server_card_editor.xml b/chrome/android/java/res/layout/autofill_server_card_editor.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b1597af29042f4d0af7222a7283fe543efe4a3b
--- /dev/null
+++ b/chrome/android/java/res/layout/autofill_server_card_editor.xml
@@ -0,0 +1,77 @@
+<?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_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_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"
+            android:textColor="?android:attr/textColorLink"
+            android:textAllCaps="true"
+            android:text="@string/autofill_wallet_management_link_text" />
+
+        <TextView
+            android:id="@+id/server_card_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:layout_toStartOf="@id/edit_server_card"
+            android:paddingTop="@dimen/pref_autofill_touch_target_padding"
+            android:paddingBottom="@dimen/pref_autofill_touch_target_padding"
+            style="@style/PreferenceTitle"
+            android:text="@string/autofill_from_google_account_long" />
+
+        <TextView
+            android:id="@+id/clear_local_copy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@id/server_card_label"
+            android:paddingStart="@dimen/pref_autofill_touch_target_padding"
+            android:paddingTop="@dimen/pref_autofill_touch_target_padding"
+            android:paddingBottom="@dimen/pref_autofill_touch_target_padding"
+            android:textColor="?android:attr/textColorLink"
+            android:textAllCaps="true"
+            android:text="@string/autofill_clear_local_copy_button" />
+
+        <TextView
+            android:id="@+id/local_copy_label"
+            android:layout_width="wrap_content"
+            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>