[AF] Change order of Autofill prefs on the Main Settings page

This was requested during UI review for the Autofill settings toggle
split, because the new proposed order (passwords, payment methods,
addresses) is more useful.

Screenshot linked in the bug.

Bug: 891305
Change-Id: Iabd587538b54fd579837c4aec8c762d91e1cfb8d
Reviewed-on: https://chromium-review.googlesource.com/1256084Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Fabio Tirelo <ftirelo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#595862}

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

@@ -30,20 +30,20 @@
         android:order="4"
         android:title="@string/prefs_search_engine"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillProfilesFragment"
-        android:key="autofill_addresses"
+        android:fragment="org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences"
+        android:key="saved_passwords"
         android:order="5"
-        android:title="@string/autofill_addresses_settings_title"/>
+        android:title="@string/prefs_saved_passwords_title"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillPaymentMethodsFragment"
         android:key="autofill_payment_methods"
         android:order="6"
         android:title="@string/autofill_payment_methods"/>
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
-        android:fragment="org.chromium.chrome.browser.preferences.password.SavePasswordsPreferences"
-        android:key="saved_passwords"
+        android:fragment="org.chromium.chrome.browser.preferences.autofill.AutofillProfilesFragment"
+        android:key="autofill_addresses"
         android:order="7"
-        android:title="@string/prefs_saved_passwords_title"/>
+        android:title="@string/autofill_addresses_settings_title"/>
     <Preference
         android:fragment="org.chromium.chrome.browser.preferences.NotificationsPreferences"
         android:key="notifications"