gapps: Import Google{Calender,Contacts}SyncAdapter.apk

* https://gitlab.com/MindTheGapps/vendor_gapps/-/tree/99a1b4d526a7d54c70411eb78b887bbea7bbf205

Change-Id: Icc87bb4050add030280edc6609aef6de281d2656
diff --git a/Android.mk b/Android.mk
index d6070b1..58275ba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,20 @@
 include vendor/gapps/build/gms_module.mk
 
 include $(CLEAR_VARS)
+LOCAL_MODULE := GoogleCalendarSyncAdapter
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+include vendor/gapps/build/gms_module.mk
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := GoogleContactsSyncAdapter
+LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+include vendor/gapps/build/gms_module.mk
+
+include $(CLEAR_VARS)
 LOCAL_MODULE := GooglePartnerSetup
 LOCAL_MODULE_CLASS := APPS
 LOCAL_PRODUCT_MODULE := true
diff --git a/etc/permissions/product/privapp-permissions-google-product.xml b/etc/permissions/product/privapp-permissions-google-product.xml
index 02be696..97280b9 100644
--- a/etc/permissions/product/privapp-permissions-google-product.xml
+++ b/etc/permissions/product/privapp-permissions-google-product.xml
@@ -377,4 +377,7 @@
     <privapp-permissions package="com.google.android.tts">
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
     </privapp-permissions>
+    <privapp-permissions package="com.google.android.syncadapters.contacts">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
 </permissions>
diff --git a/gms.mk b/gms.mk
index be57d92..7b0286f 100644
--- a/gms.mk
+++ b/gms.mk
@@ -17,6 +17,8 @@
 ## Apps
 PRODUCT_PACKAGES += \
     GmsCore \
+    GoogleCalendarSyncAdapter \
+    GoogleContactsSyncAdapter \
     GooglePartnerSetup \
     GoogleRestore \
     GoogleServicesFramework \
diff --git a/prebuilt/common/GoogleCalendarSyncAdapter.apk b/prebuilt/common/GoogleCalendarSyncAdapter.apk
new file mode 100644
index 0000000..6a7fb8f
--- /dev/null
+++ b/prebuilt/common/GoogleCalendarSyncAdapter.apk
Binary files differ
diff --git a/prebuilt/common/GoogleContactsSyncAdapter.apk b/prebuilt/common/GoogleContactsSyncAdapter.apk
new file mode 100644
index 0000000..081fa5b
--- /dev/null
+++ b/prebuilt/common/GoogleContactsSyncAdapter.apk
Binary files differ