Reland "[Android] Remove ChromeBrowserSyncAdapterService from manifest"

This reverts commit f6ce0a33.

Reason for revert: compilation errors were caused by lint complaining
that chrome/android/java/res_template/xml/syncadapter.xml is unused,
so now it is removed as well (downstream usage has been removed in
the meantime).

Original change's description:
> Revert "[Android] Remove ChromeBrowserSyncAdapterService from manifest"
>
> This reverts commit 230b08fa.
>
> Reason for revert: android-builder-perf and android_arm64-builder-perf failures.
> See:
> https://ci.chromium.org/p/chrome/builders/ci/android-builder-perf/115865
> https://ci.chromium.org/p/chrome/builders/ci/android_arm64-builder-perf/114816
>
> Original change's description:
> > [Android] Remove ChromeBrowserSyncAdapterService from manifest
> >
> > This is a follow-up to https://crrev.com/c/1821784 that removes
> > ChromeBrowserSyncAdapterService from AndroidManifest.
> >
> > Please note that chrome/android/java/res_template/xml/syncadapter.xml
> > is kept in the repo for the time being, as it is being used downstream.
> > This file will be removed in subsequent CLs.
> >
> > Bug: 1002894, 1008314
> > Change-Id: I7aa5fd7e2b5c982192aa07970d7400945f95116f
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1827413
> > Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
> > Reviewed-by: Marc Treib <treib@chromium.org>
> > Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
> > Commit-Queue: Marc Treib <treib@chromium.org>
> > Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#700703}
>
> TBR=treib@chromium.org,bsazonov@chromium.org,mamir@chromium.org
>
> Change-Id: If68359d7398372debbaec730e7df22e4cf91602a
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1002894, 1008314
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829339
> Reviewed-by: Sergey Poromov <poromov@chromium.org>
> Commit-Queue: Sergey Poromov <poromov@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#700729}

TBR=treib@chromium.org,mamir@chromium.org

Bug: 1002894, 1008314
Change-Id: I7a05b2fcc3e91267f67c4db70b91a5498efa9396
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829201
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700837}

chrome/android/BUILD.gn

@@ -1159,7 +1159,6 @@ jinja_template_resources("chrome_public_apk_template_resources") {
     "java/res_template/xml/file_paths.xml",
     "java/res_template/xml/launchershortcuts.xml",
     "java/res_template/xml/searchable.xml",
-    "java/res_template/xml/syncadapter.xml",
   ]
   res_dir = "java/res_template"
   variables = [ "manifest_package=$chrome_public_manifest_package" ]
@@ -1170,7 +1169,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
     "java/res_template/xml/file_paths.xml",
     "java/res_template/xml/launchershortcuts.xml",
     "java/res_template/xml/searchable.xml",
-    "java/res_template/xml/syncadapter.xml",
   ]
   res_dir = "java/res_template"
 

chrome/android/java/AndroidManifest.xml

@@ -951,16 +951,6 @@ by a child template that "extends" this file.
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <!-- Sync adapter for browser invalidation. -->
-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-            <meta-data android:name="android.content.SyncAdapter"
-                       android:resource="@xml/syncadapter" />
-        </service>
-
         <!-- Broadcast receiver that will be notified of account changes -->
         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
             <intent-filter>

chrome/android/java/monochrome_public_bundle__base_bundle_module.AndroidManifest.expected

@@ -1520,14 +1520,6 @@
     <service
         android:exported="false"
         android:name="org.chromium.chrome.browser.incognito.IncognitoNotificationService"/>
-    <service
-        android:exported="false"
-        android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService">
-      <intent-filter>
-        <action android:name="android.content.SyncAdapter"/>
-      </intent-filter>
-      <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter"/>
-    </service>
     <service
         android:exported="false"
         android:name="org.chromium.chrome.browser.media.MediaCaptureNotificationService"/>

chrome/android/java/res_template/xml/syncadapter.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. -->
-
-<!-- The attributes in this XML file provide configuration information -->
-<!-- for the SyncAdapter. -->
-
-<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-    android:contentAuthority="{{manifest_package}}"
-    android:accountType="com.google" />