diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index e76d8c5..32baeb8 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -54,7 +54,9 @@ endif
 # AiAi Allowlist
 PRODUCT_COPY_FILES += \
     vendor/google_pixel/apps/sysconfig/aiai_allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/aiai_allowlist.xml \
-    vendor/google_pixel/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
+    vendor/google_pixel/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml \
+    vendor/google_pixel/apps/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml \
+    vendor/google_pixel/apps/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml
 
 ## Core packages
 PRODUCT_PACKAGES += \
diff --git a/apps/apks/FlipendoPrebuilt.apk b/apps/apks/FlipendoPrebuilt.apk
index 65731c3..38ce78a 100644
Binary files a/apps/apks/FlipendoPrebuilt.apk and b/apps/apks/FlipendoPrebuilt.apk differ
diff --git a/apps/apks/GoogleExtServicesMobile.apk b/apps/apks/GoogleExtServicesMobile.apk
index 75f716b..03c7451 100644
Binary files a/apps/apks/GoogleExtServicesMobile.apk and b/apps/apks/GoogleExtServicesMobile.apk differ
diff --git a/apps/apks/MarkupGoogle.apk b/apps/apks/MarkupGoogle.apk
index c0729a1..c8b09fd 100644
Binary files a/apps/apks/MarkupGoogle.apk and b/apps/apks/MarkupGoogle.apk differ
diff --git a/apps/apks/NexusLauncherRelease.apk b/apps/apks/NexusLauncherRelease.apk
index 42df8c4..7b5ea39 100644
Binary files a/apps/apks/NexusLauncherRelease.apk and b/apps/apks/NexusLauncherRelease.apk differ
diff --git a/apps/apks/PixelSetupWizard.apk b/apps/apks/PixelSetupWizard.apk
index db4aef1..3c4cda9 100644
Binary files a/apps/apks/PixelSetupWizard.apk and b/apps/apks/PixelSetupWizard.apk differ
diff --git a/apps/apks/PlayAutoInstallConfig.apk b/apps/apks/PlayAutoInstallConfig.apk
index cf6cc0d..347f486 100644
Binary files a/apps/apks/PlayAutoInstallConfig.apk and b/apps/apks/PlayAutoInstallConfig.apk differ
diff --git a/apps/apks/RecorderPrebuilt.apk b/apps/apks/RecorderPrebuilt.apk
index 41502cb..a47e08c 100644
Binary files a/apps/apks/RecorderPrebuilt.apk and b/apps/apks/RecorderPrebuilt.apk differ
diff --git a/apps/apks/WallpaperPickerGooglePrebuilt.apk b/apps/apks/WallpaperPickerGooglePrebuilt.apk
index 19dd883..b6e21bb 100644
Binary files a/apps/apks/WallpaperPickerGooglePrebuilt.apk and b/apps/apks/WallpaperPickerGooglePrebuilt.apk differ
diff --git a/apps/permissions/privapp-permissions-google-p-pixel.xml b/apps/permissions/privapp-permissions-google-p-pixel.xml
index 173105b..c98161e 100644
--- a/apps/permissions/privapp-permissions-google-p-pixel.xml
+++ b/apps/permissions/privapp-permissions-google-p-pixel.xml
@@ -26,6 +26,15 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.google.android.aicore">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <!-- TODO(b/280571559): PACKAGE_USAGE_STATS and REAL_GET_TASKS should be removed once we
+        have an explicit permission to query the foreground state of just the calling app. -->
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
+    </privapp-permissions>
+
     <privapp-permissions package="com.google.android.apps.nbu.files">
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
     </privapp-permissions>
@@ -60,6 +69,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.READ_LOGS"/>
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
+        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.betterbug.partners">
@@ -92,6 +103,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
@@ -108,16 +120,19 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.START_ACTIVITIES_FROM_BACKGROUND"/>
         <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"/>
         <permission name="android.permission.RENOUNCE_PERMISSIONS"/>
         <permission name="android.permission.RESTART_WIFI_SUBSYSTEM"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.wearables.maestro.companion">
         <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <permission name="android.permission.MANAGE_USB"/>
         <permission name="android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS"/>
     </privapp-permissions>
 
@@ -161,6 +176,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.google.android.as.oss">
+      <permission name="android.permission.READ_RESTRICTED_STATS"/>
+    </privapp-permissions>
+
     <privapp-permissions package="com.google.android.carrier">
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS" />
@@ -231,6 +250,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MODIFY_PHONE_STATE"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
     </privapp-permissions>
 
@@ -333,6 +353,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.apps.wellbeing">
+        <permission name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"/>
         <permission name="android.permission.ACCESS_INSTANT_APPS"/>
         <permission name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"/>
         <permission name="android.permission.CONTROL_DISPLAY_SATURATION"/>
@@ -345,6 +366,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.READ_DREAM_STATE"/>
         <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
         <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
@@ -383,6 +405,7 @@ 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.CHECK_REMOTE_LOCKSCREEN"/>
         <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"/>
         <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
         <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
@@ -411,7 +434,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MANAGE_USB"/>
         <permission name="android.permission.MANAGE_USERS"/>
         <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"/>
-        <permission name="android.permission.MANAGE_WIFI_AUTO_JOIN"/>
         <permission name="android.permission.MANAGE_WIFI_NETWORK_SELECTION"/>
 	<permission name="android.permission.MANAGE_WIFI_INTERFACES"/>
         <permission name="android.permission.MASTER_CLEAR"/>
@@ -425,6 +447,8 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>
         <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.PROVIDE_DEFAULT_ENABLED_CREDENTIAL_SERVICE"/>
+        <permission name="android.permission.PROVIDE_REMOTE_CREDENTIALS"/>
         <permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
         <permission name="android.permission.PROVIDE_TRUST_AGENT"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
@@ -457,15 +481,19 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.TURN_SCREEN_ON"/>
         <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_FULL_SCREEN_INTENT"/>
         <permission name="android.permission.USE_RESERVED_DISK"/>
         <permission name="android.permission.USER_ACTIVITY"/>
         <permission name="android.permission.UWB_PRIVILEGED"/>
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
         <permission name="android.permission.WRITE_GSERVICES"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
         <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
+        <permission name="com.google.android.permission.USE_GRIL"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.gms.supervision">
@@ -510,6 +538,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
         <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
         <permission name="android.permission.REQUEST_COMPANION_SELF_MANAGED"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
     </privapp-permissions>
@@ -527,11 +556,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.MEDIA_CONTENT_CONTROL"/>
         <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <permission name="android.permission.QUERY_USERS"/>
         <permission name="android.permission.READ_DREAM_STATE"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
         <permission name="android.permission.SET_MEDIA_KEY_LISTENER"/>
         <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"/>
         <permission name="android.permission.MANAGE_USB"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <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"/>
@@ -549,6 +580,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.WRITE_DEVICE_CONFIG"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
@@ -564,7 +596,9 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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.LOCATION_HARDWARE"/>
         <permission name="android.permission.MANAGE_FINGERPRINT"/>
+        <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.MASTER_CLEAR"/>
@@ -578,6 +612,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.READ_WIFI_CREDENTIAL"/>
         <permission name="android.permission.REBOOT"/>
         <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
         <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.SET_TIME_ZONE"/>
         <permission name="android.permission.SHUTDOWN"/>
@@ -608,6 +643,10 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
     </privapp-permissions>
 
+    <privapp-permissions package="com.google.audio.hearing.visualization.accessibility.scribe">
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    </privapp-permissions>
+
     <privapp-permissions package="com.google.android.apps.cbrsnetworkmonitor">
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
@@ -626,6 +665,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING"/>
         <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
         <permission name="android.permission.REAL_GET_TASKS"/>
+        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.GoogleCamera">
@@ -664,6 +704,30 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+	<permission name="android.permission.REAL_GET_TASKS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.privacy.wildlife">
+        <permission name="android.permission.CONTROL_VPN"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.pixel.support">
+        <!-- Used to get the battery usage list from BatteryUsageContentProvider -->
+        <permission name="com.google.android.settings.intelligence.BATTERY_DATA"/>
+        <!-- Used to query charging Speed Indicator data from Turbo -->
+        <permission name="com.google.android.apps.turbo.BATTERY_DATA"/>
+        <!-- Used to get Bluetooth quality report data through BluetoothAdapter#registerBluetoothQualityReportReadyCallback() -->
+        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
+        <!-- Used to get the setting of whether the user sets the live wallpaper or not -->
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL"/>
+        <!-- Used to get device identifiers such as IMEI -->
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.nest.dockmanager.app">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.QUERY_USERS"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.systemui.clocks">
@@ -673,4 +737,20 @@ It allows additional grants on top of privapp-permissions-platform.xml
     <privapp-permissions package="com.google.android.apps.healthdata">
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
     </privapp-permissions>
+
+    <!-- go/overlay. Installed only on userdebug/eng builds. -->
+    <privapp-permissions package="com.google.android.apps.overlay">
+        <!-- Used only for internal prototyping. http://b/273973518 -->
+        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
+        <!-- Used to hand-off face-auth data-collection consent to Work Profile; http://b/243410915#comment19 -->
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.aiwallpapers">
+        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.apps.tips">
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+    </privapp-permissions>
 </permissions>
diff --git a/apps/permissions/privapp-permissions-google-se-pixel.xml b/apps/permissions/privapp-permissions-google-se-pixel.xml
index 16af364..5d5c625 100644
--- a/apps/permissions/privapp-permissions-google-se-pixel.xml
+++ b/apps/permissions/privapp-permissions-google-se-pixel.xml
@@ -27,10 +27,12 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
         <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
         <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>
+        <permission name="android.permission.READ_WALLPAPER_INTERNAL" />
         <permission name="android.permission.LOCATION_HARDWARE"/>
         <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
         <permission name="android.permission.REGISTER_STATS_PULL_ATOM"/>
         <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
+        <permission name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.settings">
@@ -82,7 +84,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <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"/>
@@ -135,6 +136,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.SHUTDOWN"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.DISPATCH_PROVISIONING_MESSAGE"/>
+        <permission name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.google.android.lily.setupwizard">
+        <permission name="android.permission.CHANGE_CONFIGURATION"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.STATUS_BAR"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.android.grilservice">
@@ -175,6 +183,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
     <privapp-permissions package="com.android.hbmsvmanager">
         <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
         <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="com.android.pixeldisplayservice">
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.ACCESS_CONTEXT_HUB"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.google.oslo">
@@ -225,9 +240,13 @@ It allows additional grants on top of privapp-permissions-platform.xml
         <permission name="android.permission.DUMP"/>
     </privapp-permissions>
 
-    <privapp-permissions package="com.google.android.apps.nest.dockmanager.app">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+    <privapp-permissions package="com.google.android.apps.nest.castauth">
+        <permission name="android.permission.QUERY_USERS"/>
     </privapp-permissions>
 
+    <!-- go/overlay-companion-app. Installed only on userdebug/eng builds. -->
+    <privapp-permissions package="com.google.android.apps.overlay.companion">
+        <!-- Used to detect user with enrolled face (may be different from the current user). http://b/272294024 -->
+        <permission name="android.permission.QUERY_USERS"/>
+    </privapp-permissions>
 </permissions>
diff --git a/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml b/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
index ef1bdea..9be772d 100644
--- a/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
+++ b/apps/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
@@ -3,24 +3,172 @@
      Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
 -->
 <config>
+    <!-- 3D Wallpapers (WallpaperPickerGoogleRelease) -->
+    <install-in-user-type package="com.google.android.apps.wallpaper">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+    <!--  Google Wallpaper Images  -->
+    <install-in-user-type package="com.google.android.apps.wallpaper.nexus">
+        <install-in user-type="FULL" />
+    </install-in-user-type>
+
+    <!-- Live Wallpaper Picker (LiveWallpapersPicker) -->
     <install-in-user-type package="com.android.wallpaper.livepicker">
         <install-in user-type="FULL" />
     </install-in-user-type>
+
+    <!-- Pixel Launcher (NexusLauncher) -->
     <install-in-user-type package="com.google.android.apps.nexuslauncher">
         <!-- Unfortunately some things (eg recents) look specifically for launcher in user 0 -->
         <install-in user-type="SYSTEM" />
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.google.android.apps.wallpaper">
+
+
+    <!--  Android Auto (AndroidAutoStubPrebuilt)
+    TODO(b/258069928): Check if this should be preinstalled on SYSTEM user -->
+    <install-in-user-type package="com.google.android.projection.gearhead">
+        <install-in user-type="SYSTEM" />
         <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
     </install-in-user-type>
-    <install-in-user-type package="com.google.android.apps.wallpaper.nexus">
+
+    <!--  Calculator (CalculatorGooglePrebuilt) -->
+    <install-in-user-type package="com.google.android.calculator">
         <install-in user-type="FULL" />
     </install-in-user-type>
-    <install-in-user-type package="com.google.android.calculator">
+
+    <!--  Calendar (CalendarGooglePrebuilt) -->
+    <install-in-user-type package="com.google.android.calendar">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Camera (GoogleCamera) -->
+    <install-in-user-type package="com.google.android.GoogleCamera">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+    </install-in-user-type>
+
+    <!--  Chrome (Chrome)
+    TODO(b/258064764): Check if this should be preinstalled on SYSTEM user -->
+    <install-in-user-type package="com.android.chrome">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Contacts (GoogleContacts) -->
+    <install-in-user-type package="com.google.android.contacts">
         <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
     </install-in-user-type>
+
+    <!--  Clock (PrebuiltDeskClockGoogle) -->
     <install-in-user-type package="com.google.android.deskclock">
         <install-in user-type="FULL" />
     </install-in-user-type>
+
+    <!--  DocumentsUIGoogle
+    TODO(b/267617358): This config should be loaded by mainline_modules_handheld.mk but has been
+    added here because adding it to mainline_modules_handheld.mk fails with go/artifact-error -->
+    <install-in-user-type package="com.google.android.documentsui">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Drive (Drive) -->
+    <install-in-user-type package="com.google.android.apps.docs">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+    </install-in-user-type>
+
+    <!--  Files (FilesPrebuilt) -->
+    <install-in-user-type package="com.google.android.apps.nbu.files">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Gmail (PrebuiltGmail) -->
+    <install-in-user-type package="com.google.android.gm">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Google Play Movies & TV (PlayVideos) -->
+    <install-in-user-type package="com.google.android.videos">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Google Search (GoogleSearchPrebuilt) -->
+    <install-in-user-type package="com.google.android.googlequicksearchbox">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!-- Maps (Maps) -->
+    <install-in-user-type package="com.google.android.apps.maps">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+    </install-in-user-type>
+
+    <!--  Messages (PrebuiltBugle) -->
+    <install-in-user-type package="com.google.android.apps.messaging">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Personal Safety (SafetyHubLprPrebuilt)
+    TODO(b/259301078): Check if this should be preinstalled on SYSTEM user -->
+    <install-in-user-type package="com.google.android.apps.safetyhub">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Phone (GoogleDialer)
+    TODO(b/259300383): Check if this should be preinstalled on SYSTEM user -->
+    <install-in-user-type package="com.google.android.dialer">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  Photos (Photos) -->
+    <install-in-user-type package="com.google.android.apps.photos">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!-- Play Store (PhoneSky)
+    TODO(b/259299438) Check if this should be preinstalled on SYSTEM user -->
+    <install-in-user-type package="com.android.vending">
+        <install-in user-type="SYSTEM" />
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!-- YouTube (YouTube) TODO: Loaded from vendor/google/products/google_apis_common.mk-->
+    <install-in-user-type package="com.google.android.youtube">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
 </config>
diff --git a/apps/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml b/apps/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml
new file mode 100644
index 0000000..755bd7c
--- /dev/null
+++ b/apps/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- System packages to preinstall on Pixel 2018-and-newer devices, per user type.
+     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
+-->
+<config>
+    <!--  Pixel Tips  -->
+    <install-in-user-type package="com.google.android.apps.tips">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+</config>
diff --git a/apps/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml b/apps/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml
new file mode 100644
index 0000000..c287846
--- /dev/null
+++ b/apps/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- System packages to preinstall on Pixel 2019-and-newer devices, per user type.
+     Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
+-->
+<config>
+    <!--  Recorder  -->
+    <install-in-user-type package="com.google.android.apps.recorder">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+
+    <!--  YouTube Music  -->
+    <install-in-user-type package="com.google.android.apps.youtube.music">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
+    </install-in-user-type>
+</config>
diff --git a/sounds/SoundPickerPrebuilt.apk b/sounds/SoundPickerPrebuilt.apk
index fd6fe09..8c04b49 100644
Binary files a/sounds/SoundPickerPrebuilt.apk and b/sounds/SoundPickerPrebuilt.apk differ