Update account and sync management UX

chrome/android/java/res/xml/account_management_preferences.xml

Index: chrome/android/java/res/xml/account_management_preferences.xml
diff --git a/chrome/android/java/res/xml/account_management_preferences.xml b/chrome/android/java/res/xml/account_management_preferences.xml
index ecd6acfb3b1012e13e84ede8d65ee8924649330c..8f55905e9d5b059ddd69281b2a58cf433eab7335 100644
--- a/chrome/android/java/res/xml/account_management_preferences.xml
+++ b/chrome/android/java/res/xml/account_management_preferences.xml
@@ -12,47 +12,37 @@
         android:title="@string/account_management_title"
         android:order="0" />
 
-    <!-- The summary is set programmatically (the exact value depends on whether modifying
-         accounts is allowed). -->
-    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
-        android:key="sign_out_switch"
-        android:order="1"
-        app:dontUseSummaryAsTitle="true" />
-    <org.chromium.chrome.browser.preferences.TextMessagePreference
-        android:key="sign_in_child_message"
-        android:title="@string/sign_in_accounts_message_child"
-        android:order="2" />
-
     <!-- Google accounts will be inserted here, using order values starting at 100 -->
 
     <org.chromium.chrome.browser.preferences.ChromeBasePreference
         android:key="add_account"
-        android:icon="@drawable/plus"
+        android:icon="@drawable/add_circle_blue"
         android:order="1000" />
 
     <PreferenceCategory
-        android:key="not_you"
-        android:order="1001" />
-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
-        android:key="go_incognito"
-        android:title="@string/account_management_go_incognito_text"
-        android:icon="@drawable/account_management_incognito"
-        android:order="1002" />
-
-    <PreferenceCategory
         android:key="parental_settings"
         android:title="@string/account_management_parental_settings"
-        android:order="1003" />
+        android:order="1001" />
     <Preference
         android:key="parent_accounts"
-        android:order="1004" />
+        android:order="1002" />
     <Preference
         android:key="child_content"
         android:title="@string/account_management_child_content_title"
-        android:order="1005" />
+        android:order="1003" />
     <Preference
         android:key="child_safe_sites"
         android:title="@string/account_management_child_safe_sites_title"
-        android:order="1006" />
+        android:order="1004" />
+
+    <org.chromium.chrome.browser.preferences.SyncPreference
+        android:key="sync_settings"
+        android:title="@string/sign_in_sync"
+        android:order="1005"/>
+
+    <Preference
+        android:key="sign_out"
+        android:title="@string/account_management_sign_out"
+        android:order="1006"/>
 
 </PreferenceScreen>