[Autofill and payments] Redesign Autofill settings UIs

chrome/android/java/res/xml/main_preferences.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2015 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. -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <org.chromium.chrome.browser.preferences.SignInPreference
         android:key="sign_in"
         android:title="@string/sign_in_to_chrome" />
 
     <PreferenceCategory
         android:title="@string/prefs_section_basics"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.preferences.SearchEnginePreference"
         android:key="search_engine"
         android:title="@string/prefs_search_engine"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillPreferences"
+        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillAndPaymentsPreferences"
         android:key="autofill_settings"
-        android:title="@string/prefs_autofill" />
+        android:title="@string/prefs_autofill_and_payments" />
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:key="saved_passwords"/>
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.HomepagePreferences"
         android:key="homepage"
         android:title="@string/options_homepage_title" />
 
     <PreferenceCategory
         android:title="@string/prefs_section_advanced"/>
     <Preference
@@ skipping 11 matching lines @@
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
         android:key="data_reduction"
         android:title="@string/data_reduction_title" />
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.AboutChromePreferences"
         android:key="about_chrome"
         android:title="@string/prefs_about_chrome" />
 
 </PreferenceScreen>