diff --git a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
index 45a917d..782976d 100644
Binary files a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk and b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk differ
diff --git a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
index f21ca27..081fa5b 100644
Binary files a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ
diff --git a/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml
similarity index 58%
rename from common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml
rename to common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml
index 6c2227d..4e91878 100644
--- a/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml
+++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml
@@ -1,234 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--
-This XML file declares which signature|privileged permissions should be granted to privileged
-applications in /product GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
+<?xml version="1.0" ?>
 <permissions>
-
-    <privapp-permissions package="com.google.android.apps.nbu.files">
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.angle">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.connectivity.metrics">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>.
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.helprtc">
-        <permission name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.betterbug">
-        <permission name="android.permission.DUMP"/>
+    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.internal.betterbug">
-        <permission name="android.permission.DUMP"/>
+    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
+        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.carrier.log">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.pixelmigrate">
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.safetyhub">
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.scone">
-        <deny-permission name="android.permission.ACCESS_CONTEXT_HUB"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WIFI_UPDATE_USABILITY_STATS_SCORE"/>
-        <permission name="android.permission.WIFI_SET_DEVICE_MOBILITY_STATE"/>
-        <permission name="android.permission.NETWORK_SCAN"/>
-        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.wearables.maestro.companion">
-        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.work.oobconfig">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE" />
-        <permission name="android.permission.MASTER_CLEAR"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.as">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
-        <permission name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
-        <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.carrier">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS" />
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.carrier.carrierwifi">
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.NETWORK_CARRIER_PROVISIONING"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.dialer">
-        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-        <permission name="android.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.REGISTER_CONNECTION_MANAGER"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
-        <permission name="com.google.android.dialer.permission.RECEIVE_RING_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.euicc">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
-        <permission name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="com.google.android.permission.USE_GRIL" />
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.euiccpixel">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.hiddenmenu">
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.ims">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.tetheringentitlement">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.TETHER_PRIVILEGED"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.wfcactivation">
-        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.intelligence.sense">
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.breel.wallpapers19">
-        <permission name="android.permission.AMBIENT_WALLPAPER"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.android.vending">
         <permission name="android.permission.ALLOCATE_AGGRESSIVE"/>
         <permission name="android.permission.BACKUP"/>
@@ -256,36 +35,75 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.REBOOT"/>
         <permission name="android.permission.SEND_DEVICE_CUSTOMIZATION_READY"/>
         <permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
-        <permission name="android.permission.SET_PREFERRED_APPLICATIONS"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.UPDATE_DEVICE_STATS"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="com.android.permission.USE_INSTALLER_V2"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.feedback">
-        <permission name="android.permission.READ_LOGS"/>
+    <privapp-permissions package="com.google.android.apps.actionsservice">
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.assistant">
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
-
     <privapp-permissions package="com.google.android.apps.gcs">
         <permission name="android.permission.CONTROL_VPN"/>
-        <permission name="android.permission.GET_APP_OPS_STATS"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.SCORE_NETWORKS"/>
-        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.nova.bugreportwrapper">
-        <permission name="android.permission.DUMP"/>
+    <privapp-permissions package="com.google.android.apps.nbu.files">
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.photos">
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.restore">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.searchlite">
+        <permission name="android.permission.BIND_APPWIDGET"/>
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.GLOBAL_SEARCH"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.setupwizard.searchselector">
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.speechservices">
+        <permission name="android.permission.BIND_APPWIDGET"/>
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.GLOBAL_SEARCH"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.STOP_APP_SWITCHES"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.apps.tachyon">
+        <permission name="android.permission.STATUS_BAR"/>
     </privapp-permissions>
-
     <privapp-permissions package="com.google.android.apps.turbo">
-        <permission name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" />
-        <permission name="android.permission.BATTERY_STATS" />
+        <permission name="android.permission.ACCESS_AMBIENT_LIGHT_STATS"/>
+        <permission name="android.permission.BATTERY_STATS"/>
         <permission name="android.permission.BRIGHTNESS_SLIDER_USAGE"/>
         <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
         <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS"/>
@@ -294,11 +112,14 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.POWER_SAVER"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
     </privapp-permissions>
-
+    <privapp-permissions package="com.google.android.apps.wallpaper">
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
+    </privapp-permissions>
     <privapp-permissions package="com.google.android.apps.wellbeing">
-        <permission name="android.permission.ACCESS_INSTANT_APPS"/>
         <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
         <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
+        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
         <permission name="android.permission.MODIFY_PHONE_STATE"/>
         <permission name="android.permission.MODIFY_QUIET_MODE"/>
         <permission name="android.permission.OBSERVE_APP_USAGE"/>
@@ -308,21 +129,28 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-        <permission name="android.permission.SUSPEND_APPS"/>
+        <permission name="android.permission.SYSTEM_APPLICATION_OVERLAY"/>
         <permission name="android.permission.WRITE_DREAM_STATE"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+		<permission name="android.permission.ACCESS_INSTANT_APPS"/>
+		<permission name="android.permission.SUSPEND_APPS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.backuptransport">
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+    <privapp-permissions package="com.google.android.calendar">
+        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
     </privapp-permissions>
-
     <privapp-permissions package="com.google.android.configupdater">
         <permission name="android.permission.UPDATE_CONFIG"/>
     </privapp-permissions>
-
+    <privapp-permissions package="com.google.android.contacts">
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.feedback">
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.READ_LOGS"/>
+    </privapp-permissions>
     <privapp-permissions package="com.google.android.gms">
+        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
         <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
         <permission name="android.permission.ACTIVITY_EMBEDDING"/>
         <permission name="android.permission.ALLOCATE_AGGRESSIVE"/>
@@ -335,13 +163,16 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.CAPTURE_VIDEO_OUTPUT"/>
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
         <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+        <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
         <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
         <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
         <permission name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"/>
         <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
+        <permission name="android.permission.DOMAIN_VERIFICATION_AGENT"/>
         <permission name="android.permission.DUMP"/>
         <permission name="android.permission.GET_APP_OPS_STATS"/>
+        <permission name="android.permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE" />
         <permission name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
@@ -353,8 +184,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_ROLLBACKS"/>
         <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
         <permission name="android.permission.MANAGE_SUBSCRIPTION_PLANS"/>
+        <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION"/>
         <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MANAGE_USERS"/>
         <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
         <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
         <permission name="android.permission.MODIFY_NETWORK_ACCOUNTING"/>
@@ -367,64 +201,40 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.PROVIDE_TRUST_AGENT"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
         <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
         <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.REBOOT"/>
         <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
         <permission name="android.permission.RECOVER_KEYSTORE"/>
         <permission name="android.permission.RECOVERY"/>
         <permission name="android.permission.REGISTER_CALL_PROVIDER"/>
         <permission name="android.permission.REMOTE_DISPLAY_PROVIDER"/>
+        <permission name="android.permission.RENOUNCE_PERMISSIONS"/>
         <permission name="android.permission.RESET_PASSWORD"/>
+        <permission name="android.permission.SCHEDULE_PRIORITIZED_ALARM"/>
         <permission name="android.permission.SCORE_NETWORKS"/>
         <permission name="android.permission.SEND_SMS_NO_CONFIRMATION"/>
         <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.SET_TIME_ZONE"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
+        <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON"/>
         <permission name="android.permission.TETHER_PRIVILEGED"/>
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+        <permission name="android.permission.UPDATE_FONTS" />
         <permission name="android.permission.USE_RESERVED_DISK"/>
         <permission name="android.permission.USER_ACTIVITY"/>
+        <permission name="android.permission.UWB_PRIVILEGED"/>
+        <permission name="android.permission.WRITE_GSERVICES"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
         <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.projection.gearhead">
-        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>
-        <permission name="android.permission.ACTIVITY_EMBEDDING"/>
-        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-	<permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
-        <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_USB"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
-        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.REGISTER_CALL_PROVIDER"/>
-        <permission name="android.permission.REMOTE_DISPLAY_PROVIDER"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.USER_ACTIVITY"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.google.android.googlequicksearchbox">
         <permission name="android.permission.BIND_APPWIDGET"/>
         <permission name="android.permission.CALL_PRIVILEGED"/>
@@ -443,23 +253,65 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"/>
         <permission name="android.permission.MANAGE_USB"/>
         <permission name="android.permission.SHOW_KEYGUARD_MESSAGE"/>
+        <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.STOP_APP_SWITCHES"/>
         <permission name="com.google.android.permission.SET_WATCH_FACE_PRIVILEGED"/>
         <permission name="android.permission.WRITE_APN_SETTINGS"/>
     </privapp-permissions>
-    <privapp-permissions package="com.google.android.settings.intelligence">
-        <permission name="android.permission.MANAGE_FINGERPRINT"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_DEVICE_CONFIG"/>
-        <permission name="android.permission.READ_SEARCH_INDEXABLES"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.WRITE_DEVICE_CONFIG"/>
+    <privapp-permissions package="com.google.android.gsf">
+        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
+        <permission name="android.permission.RECOVERY"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+        <permission name="android.permission.WRITE_GSERVICES"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA"/>
     </privapp-permissions>
-
+    <privapp-permissions package="com.google.android.inputmethod.latin">
+        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.onetimeinitializer">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.partnersetup">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+    <privapp-permissions package="com.google.android.projection.gearhead">
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <permission name="android.permission.BIND_DIRECTORY_SEARCH"/>
+        <permission name="android.permission.CALL_PRIVILEGED"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
+        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.ENTER_CAR_MODE_PRIORITIZED"/>
+        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <!-- Should be removed once it is granted via role. -->
+        <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION"/>
+        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+    </privapp-permissions>
     <privapp-permissions package="com.google.android.setupwizard">
         <permission name="android.permission.BACKUP"/>
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
@@ -479,31 +331,16 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
         <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.SET_TIME_ZONE"/>
         <permission name="android.permission.SHUTDOWN"/>
-        <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.WRITE_APN_SETTINGS"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.android.hotwordenrollment.okgoogle">
-        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
+    <privapp-permissions package="com.google.android.syncadapters.contacts">
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
-
-    <privapp-permissions package="com.android.hotwordenrollment.xgoogle">
-        <permission name="android.permission.KEYPHRASE_ENROLLMENT_APPLICATION"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.partnersetup">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
 </permissions>
diff --git a/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml b/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml
new file mode 100644
index 0000000..cbe323d
--- /dev/null
+++ b/common/proprietary/product/etc/sysconfig/d2d_cable_migration_feature.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+    <feature name="com.google.android.feature.D2D_CABLE_MIGRATION_FEATURE" />
+</config>
diff --git a/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml
similarity index 60%
rename from common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
rename to common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml
index 0e2c304..54bcfbb 100644
--- a/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
+++ b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-allowlist.xml
@@ -1,34 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
 <!--
 This XML file declares which platform apps that need to access internal APIs.
 -->
 <config>
-  <hidden-api-whitelisted-app package="android.car.cluster.maserati" />
   <hidden-api-whitelisted-app package="com.android.apps.tag" />
-  <hidden-api-whitelisted-app package="com.android.auto.embedded.cts.verifier" />
-  <hidden-api-whitelisted-app package="com.android.car.bugreport" />
-  <hidden-api-whitelisted-app package="com.android.car.carlauncher" />
-  <hidden-api-whitelisted-app package="com.android.car.home" />
-  <hidden-api-whitelisted-app package="com.android.car.retaildemo" />
-  <hidden-api-whitelisted-app package="com.android.car.settingslib.robotests" />
-  <hidden-api-whitelisted-app package="com.android.car.setupwizardlib.robotests" />
-  <hidden-api-whitelisted-app package="com.android.cardock" />
   <hidden-api-whitelisted-app package="com.android.connectivity.metrics" />
   <hidden-api-whitelisted-app package="com.android.facelock" />
   <hidden-api-whitelisted-app package="com.android.google.gce.gceservice" />
@@ -54,16 +29,6 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.google.android.apps.wallpaper" />
   <hidden-api-whitelisted-app package="com.google.android.asdiv" />
   <hidden-api-whitelisted-app package="com.google.android.athome.globalkeyinterceptor" />
-  <hidden-api-whitelisted-app package="com.google.android.car.defaultstoragemonitoringcompanionapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticrecorder" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diagnosticverifier" />
-  <hidden-api-whitelisted-app package="com.google.android.car.diskwriteapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.flashapp" />
-  <hidden-api-whitelisted-app package="com.google.android.car.kitchensink" />
-  <hidden-api-whitelisted-app package="com.google.android.car.obd2app" />
-  <hidden-api-whitelisted-app package="com.google.android.car.setupwizard" />
-  <hidden-api-whitelisted-app package="com.google.android.car.usb.aoap.host" />
-  <hidden-api-whitelisted-app package="com.google.android.car.vms.subscriber" />
   <hidden-api-whitelisted-app package="com.google.android.carrier" />
   <hidden-api-whitelisted-app package="com.google.android.carriersetup" />
   <hidden-api-whitelisted-app package="com.google.android.connectivitymonitor" />
@@ -77,7 +42,6 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.google.android.onetimeinitializer" />
   <hidden-api-whitelisted-app package="com.google.android.permissioncontroller" />
   <hidden-api-whitelisted-app package="com.google.android.partner.provisioning" />
-  <hidden-api-whitelisted-app package="com.google.android.partnersetup" />
   <hidden-api-whitelisted-app package="com.google.android.pixel.setupwizard" />
   <hidden-api-whitelisted-app package="com.google.android.preloaded_drawable_viewer" />
   <hidden-api-whitelisted-app package="com.google.android.printservice.recommendation" />
@@ -99,15 +63,4 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.htc.omadm.trigger" />
   <hidden-api-whitelisted-app package="com.qualcomm.qcrilmsgtunnel" />
   <hidden-api-whitelisted-app package="com.ustwo.lwp" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.accessibilityhelper" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.apkcacheprovider" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.applauncher" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.backup_settings" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.cast_receiver" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.crash_collector" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.file_system" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.gms" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.home" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.intent_helper" />
-  <hidden-api-whitelisted-app package="org.chromium.arc.tts" />
 </config>
diff --git a/common/proprietary/product/etc/sysconfig/google.xml b/common/proprietary/product/etc/sysconfig/google.xml
index aa63d06..2012859 100644
--- a/common/proprietary/product/etc/sysconfig/google.xml
+++ b/common/proprietary/product/etc/sysconfig/google.xml
@@ -1,19 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <!-- These are configurations that must exist on all GMS devices. -->
 <config>
     <!-- These are the standard packages that are white-listed to always have internet
@@ -23,11 +8,8 @@
     <allow-in-power-save package="com.google.android.gms" />
     <allow-in-data-usage-save package="com.google.android.gms" />
     <allow-unthrottled-location package="com.google.android.gms" />
-    <allow-ignore-location-settings package="com.google.android.gms" />
-
-    <!-- OobConfig must always have network access to fetch enterprise and carrier lock config. -->
-    <allow-in-power-save-except-idle package="com.google.android.apps.work.oobconfig" />
-    <allow-in-data-usage-save package="com.google.android.apps.work.oobconfig" />
+    <allow-ignore-location-settings package="com.google.android.gms" attributionTag="com.google.android.gms.thunderbird" />
+    <allow-ignore-location-settings package="com.google.android.dialer" attributionTag="*" />
 
     <!-- Turbo must not have App Standby restrictions in order to push new
          App Standby buckets to the platform periodically -->
@@ -45,12 +27,6 @@
     <!-- Play Store likewise must have network access to support other applications. -->
     <allow-in-power-save-except-idle package="com.android.vending" />
 
-    <!-- If the volta app is pre-installed (for monitoring power use), let it do checkins. -->
-    <allow-in-power-save package="com.google.android.volta" />
-
-    <!-- If GoogleCellBroadcastServiceModule is installed, let it run in the background -->
-    <allow-in-power-save package="com.google.android.cellbroadcastreceiver" />
-
     <!-- If CarrierServices is installed, it must always have network access to
          reliably receive IMS messages. -->
     <allow-in-power-save package="com.google.android.ims" />
@@ -60,12 +36,14 @@
 
     <!-- Apps below are required on all GMS devices -->
     <app-link package="com.android.vending" />
+    <app-link package="com.google.android.gms" />
     <app-link package="com.google.android.apps.maps" />
     <app-link package="com.google.android.youtube" />
     <app-link package="com.google.android.apps.docs" />
     <app-link package="com.google.android.talk" />
     <app-link package="com.google.android.apps.photos" />
     <app-link package="com.google.android.apps.youtube.music" />
+    <app-link package="com.google.android.googlequicksearchbox" />
 
     <!-- Apps below are optional on GMS devices -->
     <app-link package="com.google.android.apps.tycho" />
@@ -88,8 +66,6 @@
     <!-- These are the packages that are uninstalled for system user -->
     <!-- Apps below are required on all GMS devices -->
     <system-user-blacklisted-app package="com.google.android.googlequicksearchbox" />
-    <!-- Apps below are optional on GMS devices -->
-    <system-user-blacklisted-app package="com.google.android.launcher" />
 
     <!-- Whitelist of what components are permitted as backup data transports.  The
          'service' attribute here is a flattened ComponentName string. -->
@@ -98,16 +74,6 @@
     <backup-transport-whitelisted-service
         service="com.google.android.gms/.backup.component.D2dTransportService" />
 
-    <!-- Specify the explicit set of other applications that AI services are allowed to
-         interact with, including the providers that back the implementation of the APIs
-         provided by the package. -->
-    <allow-association target="com.google.android.as" allowed="com.android.bluetooth" />
-    <allow-association target="com.google.android.as" allowed="com.android.providers.contacts" />
-    <allow-association target="com.google.android.as" allowed="com.android.providers.media" />
-    <allow-association target="com.google.android.as" allowed="com.android.providers.telephony" />
-    <allow-association target="com.google.android.as" allowed="com.android.systemui" />
-    <allow-association target="com.google.android.as" allowed="com.google.android.providers.media.module" />
-
     <!-- Specify the explicit set of other applications whose app data directories are
         accessible by other applications. -->
     <app-data-isolation-whitelisted-app package="com.google.android.gms" />
diff --git a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk
new file mode 100644
index 0000000..785010e
Binary files /dev/null and b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk differ
diff --git a/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk b/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk
deleted file mode 100644
index f8dc784..0000000
Binary files a/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk and /dev/null differ
diff --git a/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
new file mode 100644
index 0000000..6b626c7
Binary files /dev/null and b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ
diff --git a/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk b/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk
deleted file mode 100644
index a7a05d1..0000000
Binary files a/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk and /dev/null differ
diff --git a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml
deleted file mode 100644
index 7797166..0000000
--- a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--
-This XML file declares which signature|privileged permissions should be granted to privileged
-applications in /system_ext on GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
-<permissions>
-
-    <privapp-permissions package="com.android.systemui">
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
-        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.settings">
-        <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.systemui">
-        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
-        <permission name="android.permission.DUMP"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.storagemanager">
-        <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.USE_RESERVED_DISK"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.volta">
-        <permission name="android.permission.BATTERY_STATS"/>
-        <permission name="android.permission.CHANGE_APP_IDLE_STATE"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.QUERY_ALL_PACKAGES"/>
-        <permission name="android.permission.REAL_GET_TASKS"/>
-        <permission name="android.permission.REBOOT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.nexuslauncher">
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.gsf">
-        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
-        <permission name="android.permission.BACKUP"/>
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MASTER_CLEAR"/>
-        <permission name="android.permission.READ_DREAM_STATE"/>
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.REBOOT"/>
-        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
-        <permission name="android.permission.RECOVERY"/>
-        <permission name="android.permission.SET_TIME"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
-        <permission name="android.permission.WRITE_GSERVICES"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.partnersetup">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.carriersetup">
-        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.wallpaper">
-        <permission name="android.permission.BIND_WALLPAPER"/>
-        <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
-        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
-        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.feedback">
-        <permission name="android.permission.READ_LOGS"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.onetimeinitializer">
-        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.yadayada">
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.pixel.setupwizard">
-        <permission name="android.permission.CHANGE_CONFIGURATION"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.SHUTDOWN"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.apps.cbrsnetworkmonitor">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.grilservice">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.connectivitymonitor">
-        <permission name="android.permission.DUMP"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.connectivitythermalpowermanager">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
-        <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.refreshratecontrol">
-        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.hbmsvmanager">
-        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.oslo">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.LOCATION_HARDWARE"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-        <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.RECORD_AUDIO"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
-        <permission name="android.permission.USER_ACTIVITY"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.emergency">
-        <!-- Required to place emergency calls from emergency info screen. -->
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-        <permission name="android.permission.MANAGE_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.devicedropmonitor">
-        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.uvexposurereporter">
-        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.google.android.iphealthmonitor">
-        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    </privapp-permissions>
-</permissions>
diff --git a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml
new file mode 100644
index 0000000..5f8e702
--- /dev/null
+++ b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file declares which signature|privileged permissions should be granted to
+privileged Google applications in GMS devices.
+-->
+<permissions>
+    <privapp-permissions package="com.google.android.feedback">
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.gsf">
+        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.DUMP"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.READ_DREAM_STATE"/>
+        <permission name="android.permission.READ_LOGS"/>
+        <permission name="android.permission.READ_NETWORK_USAGE_HISTORY"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"/>
+        <permission name="android.permission.RECOVERY"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.UPDATE_DEVICE_STATS"/>
+        <permission name="android.permission.WRITE_GSERVICES"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.onetimeinitializer">
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.setupwizard">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
+        <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.INVOKE_CARRIER_SETUP"/>
+        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>
+        <permission name="android.permission.MANAGE_FINGERPRINT"/>
+        <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MASTER_CLEAR"/>
+        <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.NOTIFICATION_DURING_SETUP"/>
+        <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
+        <permission name="android.permission.PERFORM_CDMA_PROVISIONING"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
+        <permission name="android.permission.SET_TIME"/>
+        <permission name="android.permission.SET_TIME_ZONE"/>
+        <permission name="android.permission.SHUTDOWN"/>
+        <permission name="android.permission.STATUS_BAR"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+</permissions>
diff --git a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk
index 3dfb684..4ab99d8 100644
Binary files a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk differ
diff --git a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
index 02d2b15..31219e3 100644
Binary files a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ
diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt
index e1846d7..610354e 100644
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -1,4 +1,4 @@
--product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32
+-product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED
 -product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED
 -product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2