diff --git a/config.mk b/config.mk
index 8ad804cb3..0fc9b2f67 100644
--- a/config.mk
+++ b/config.mk
@@ -24,13 +24,13 @@ endif
 
 PRODUCT_COPY_FILES += \
     vendor/addons/prebuilt/product/etc/permissions/com.android.angle.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.android.angle.xml \
+    vendor/addons/prebuilt/product/etc/sysconfig/contextual_search.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/contextual_search.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/dialer_experience.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/dialer_experience.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_build.xml \
-    vendor/addons/prebuilt/product/etc/sysconfig/google_exclusives_enable.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_exclusives_enable.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-whitelist.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/nexus.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/nexus.xml \
-    vendor/addons/prebuilt/product/etc/sysconfig/pixel_2016_exclusive.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_2016_exclusive.xml \
+    vendor/addons/prebuilt/product/etc/sysconfig/nga.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/nga.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml \
     vendor/addons/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/preinstalled-packages-product-pixel-2019-and-newer.xml \
diff --git a/prebuilt/product/etc/sysconfig/contextual_search.xml b/prebuilt/product/etc/sysconfig/contextual_search.xml
new file mode 100644
index 000000000..70278e2dd
--- /dev/null
+++ b/prebuilt/product/etc/sysconfig/contextual_search.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- These are configurations that should exist on devices that suppot Contextual Search -->
+<config>
+    <!-- This feature identifies devices with Contextual Search (Circle to Search) -->
+    <feature name="com.google.android.feature.CONTEXTUAL_SEARCH"/>
+</config>
diff --git a/prebuilt/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml b/prebuilt/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
old mode 100755
new mode 100644
index 172f0395a..886e2bc99
--- a/prebuilt/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
+++ b/prebuilt/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
@@ -22,6 +22,7 @@ This XML file declares which platform apps that need to access internal APIs.
   <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" />
@@ -29,6 +30,7 @@ This XML file declares which platform apps that need to access internal APIs.
   <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" />
   <hidden-api-whitelisted-app package="com.android.hotwordenrollment.okgoogle" />
   <hidden-api-whitelisted-app package="com.android.hotwordenrollment.tgoogle" />
@@ -49,11 +51,9 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.android.tv.provision" />
   <hidden-api-whitelisted-app package="com.google.SSRestartDetector" />
   <hidden-api-whitelisted-app package="com.google.android.apps.nexuslauncher" />
-  <hidden-api-whitelisted-app package="com.google.android.apps.turbo" />
   <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.bugreport" />
   <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" />
@@ -74,8 +74,6 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.google.android.gsf" />
   <hidden-api-whitelisted-app package="com.google.android.hardwareinfo" />
   <hidden-api-whitelisted-app package="com.google.android.hiddenmenu" />
-  <hidden-api-whitelisted-app package="com.google.android.onetimeinitializer" />
-  <hidden-api-whitelisted-app package="com.google.android.packageinstaller" />
   <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" />
@@ -84,15 +82,14 @@ This XML file declares which platform apps that need to access internal APIs.
   <hidden-api-whitelisted-app package="com.google.android.printservice.recommendation" />
   <hidden-api-whitelisted-app package="com.google.android.sampledeviceowner" />
   <hidden-api-whitelisted-app package="com.google.android.apps.scone" />
+  <hidden-api-whitelisted-app package="com.google.android.apps.pixel.dcservice" />
   <hidden-api-whitelisted-app package="com.google.android.sdksetup" />
   <hidden-api-whitelisted-app package="com.google.android.setupwizard" />
   <hidden-api-whitelisted-app package="com.google.android.storagemanager" />
   <hidden-api-whitelisted-app package="com.google.android.tag" />
-  <hidden-api-whitelisted-app package="com.google.android.tungsten.overscan" />
   <hidden-api-whitelisted-app package="com.google.android.tungsten.setupwraith" />
   <hidden-api-whitelisted-app package="com.google.android.tv.bugreportsender" />
   <hidden-api-whitelisted-app package="com.google.android.tv.frameworkpackagestubs" />
-  <hidden-api-whitelisted-app package="com.google.android.tv.pairedsetup" />
   <hidden-api-whitelisted-app package="com.google.android.vendorloggingservice" />
   <hidden-api-whitelisted-app package="com.google.android.volta" />
   <hidden-api-whitelisted-app package="com.google.android.wfcactivation" />
diff --git a/prebuilt/product/etc/sysconfig/google.xml b/prebuilt/product/etc/sysconfig/google.xml
old mode 100755
new mode 100644
index 082850e67..62f6e1873
--- a/prebuilt/product/etc/sysconfig/google.xml
+++ b/prebuilt/product/etc/sysconfig/google.xml
@@ -26,6 +26,12 @@
     <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="*" />
 
+    <!-- SCONE must get device location for satellite emergency communications. -->
+    <allow-ignore-location-settings package="com.google.android.apps.scone" attributionTag="satellite_esos" />
+
+    <!-- Satellite access controller must get device location for satellite emergency communications. -->
+    <allow-ignore-location-settings package="com.android.phone" attributionTag="telephony" />
+
     <!-- 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" />
@@ -60,6 +66,10 @@
     <allow-in-power-save package="com.google.android.ims" />
     <allow-in-data-usage-save package="com.google.android.ims" />
 
+    <!-- Allow SetupWizard keeping at unrestricted mode of Battery usage. -->
+    <bg-restriction-exemption package="com.google.android.setupwizard"/>
+    <bg-restriction-exemption package="com.google.android.apps.setupwizard.searchselector"/>
+
     <!-- These Google applications all handle URLs to their websites by default -->
 
     <!-- Apps below are required on all GMS devices -->
@@ -91,21 +101,34 @@
         service="com.google.android.gms/.backup.BackupTransportService" />
     <backup-transport-whitelisted-service
         service="com.google.android.gms/.backup.component.D2dTransportService" />
+    <backup-transport-whitelisted-service
+        service="com.google.android.apps.restore/.transport.BackupTransportService" />
+    <backup-transport-whitelisted-service
+        service="com.google.android.apps.restore/.transport.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.bluetooth.services" />
     <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.bluetooth" />
+    <allow-association target="com.google.android.as" allowed="com.google.android.bluetooth.services" />
     <allow-association target="com.google.android.as" allowed="com.google.android.providers.media.module" />
     <!-- AI services can bind to its open-source network component. -->
     <allow-association target="com.google.android.as" allowed="com.google.android.as.oss" />
 
-    <!-- AI services open-source network component can only bind back to the core package. -->
+    <!-- AI services open-source network component can bind back to the core package. -->
     <allow-association target="com.google.android.as.oss" allowed="com.google.android.as" />
+    <!-- AI services open-source network component can bind to AI Core. -->
+    <allow-association target="com.google.android.as.oss" allowed="com.google.android.aicore" />
+
+    <!-- Pixel Launcher can bind to the open-source network component. -->
+    <allow-association target="com.google.android.as.oss" allowed="com.google.android.apps.nexuslauncher" />
 
     <!-- Specify the explicit set of other applications whose app data directories are
         accessible by other applications. -->
@@ -113,4 +136,23 @@
 
     <!-- Whitelist of packages that eligible for rollback -->
     <rollback-whitelisted-app package="com.android.vending" />
+    <rollback-whitelisted-app package="com.google.android.gms" />
+
+    <!-- Specify the installer eligiable for updating the given GMS package. -->
+    <update-ownership package="com.google.android.gms" installer="com.android.vending" />
+
+    <!-- Denylist of packages that are not eligible for automatic rollback -->
+    <automatic-rollback-denylisted-app package="com.android.vending" />
+    <automatic-rollback-denylisted-app package="com.google.android.gms" />
+
+    <!-- Allow device lock controller app to schedule jobs and alarms, and have network access when app
+         in background; otherwise, it may not be able to enforce provision for managed devices. -->
+    <allow-in-power-save package="com.google.android.devicelockcontroller" />
+    <allow-in-data-usage-save package="com.google.android.devicelockcontroller" />
+
+
+    <!-- These packages are part of Remote Key Provisioning and are allowed to always have
+         internet access while in power save mode, or in data saver mode. -->
+    <allow-in-power-save package="com.google.android.rkpdapp" />
+    <allow-in-data-usage-save package="com.google.android.rkpdapp" />
 </config>
diff --git a/prebuilt/product/etc/sysconfig/google_build.xml b/prebuilt/product/etc/sysconfig/google_build.xml
old mode 100755
new mode 100644
diff --git a/prebuilt/product/etc/sysconfig/google_exclusives_enable.xml b/prebuilt/product/etc/sysconfig/google_exclusives_enable.xml
deleted file mode 100755
index 9b4f5182b..000000000
--- a/prebuilt/product/etc/sysconfig/google_exclusives_enable.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- These are configurations that should exist on Google's 2016 and newer Nexus devices. -->
-<config>
-
-    <!-- This is meant to be the canonical feature identifying 2016 and newer Nexus devices. -->
-    <feature name="com.google.android.feature.PIXEL_EXPERIENCE" />
-
-    <!-- This is meant to be the canonical feature identifying 2017 and newer Nexus devices. -->
-    <feature name="com.google.android.feature.PIXEL_2017_EXPERIENCE" />
-
-    <!-- This is meant to be the canonical feature identifying 2018 and newer Pixel devices. -->
-    <feature name="com.google.android.feature.PIXEL_2018_EXPERIENCE" />
-
-    <!-- The feature identifying devices which are able to use the Turbo app -->
-    <feature name="com.google.android.feature.TURBO_PRELOAD" />
-
-    <!-- The feature identifying devices which are able to use the Android Wellbeing app. -->
-    <feature name="com.google.android.feature.WELLBEING" />
-	
-</config>
\ No newline at end of file
diff --git a/prebuilt/product/etc/sysconfig/nexus.xml b/prebuilt/product/etc/sysconfig/nexus.xml
old mode 100755
new mode 100644
index fed0854af..bd40b10d3
--- a/prebuilt/product/etc/sysconfig/nexus.xml
+++ b/prebuilt/product/etc/sysconfig/nexus.xml
@@ -11,8 +11,9 @@
     <!-- The feature identifying devices which are able to use the Android Wellbeing app. -->
     <feature name="com.google.android.feature.WELLBEING" />
 
-    <!-- Enable Zero Touch Provisioning support for 2016 and newer Nexus devices. -->
-    <feature name="com.google.android.feature.ZERO_TOUCH" />
+    <!-- The feature identifying devices which are able to use the device-to-device migration
+        over cable provided by the Pixelmigrate app. -->
+    <feature name="com.google.android.feature.D2D_CABLE_MIGRATION_FEATURE" />
 
     <!-- Allow WfcActivation app scheduled jobs to run when app in background. -->
     <allow-in-power-save-except-idle package="com.google.android.wfcactivation" />
@@ -23,6 +24,12 @@
     <!-- Allow connectivitymonitor service in background -->
     <allow-in-power-save package="com.google.android.connectivitymonitor" />
 
+    <!-- Allow connectivitythermalpowermanager service in background -->
+    <allow-in-power-save package="com.google.android.connectivitythermalpowermanager" />
+
+    <!-- Allow iwlan service in backgroud-->
+    <allow-in-power-save package="com.google.android.iwlan" />
+
     <!-- Allow ramdump uploader service in background -->
     <allow-in-power-save package="com.android.ramdump" />
 
@@ -32,6 +39,10 @@
     <!-- Whitelist so headless app JobIntentService can work. b/73250911 -->
     <allow-in-power-save-except-idle package="com.google.android.carrier" />
 
+    <!-- Whitelist so headless app JobService can work. b/135126855 -->
+    <!-- Allow CarrierWifi WifiScorerService to run in background. b/334906519 -->
+    <allow-in-power-save package="com.google.android.apps.carrier.carrierwifi" />
+
     <!-- These are telephony components that need to run in the background -->
     <allow-in-power-save package="com.qualcomm.atfwd" />
     <allow-in-power-save package="com.qualcomm.embms" />
@@ -43,9 +54,6 @@
     <!-- Pre-installed carrier apps which should be disabled until a matching SIM is inserted. -->
     <disabled-until-used-preinstalled-carrier-app package="com.google.android.apps.tycho" />
 
-    <!-- Verizon MVS app: pre-installed and should be disabled until Verizon SIM inserted. -->
-    <disabled-until-used-preinstalled-carrier-app package="com.verizon.mips.services" />
-
     <!-- Whitelist so the app can run JobIntentService in background. b/77932342 -->
     <allow-in-power-save-except-idle package="com.google.android.tetheringentitlement" />
     <!-- Tethering entitlement check app should have Internet access while in data saving mode,
@@ -55,4 +63,7 @@
     <!-- Allow eMBMS middleware services to run in the background -->
     <allow-in-power-save package="com.qualcomm.ltebc_vzw" />
     <allow-in-power-save package="com.qualcomm.ltebc" />
+
+    <!-- Allow gnss pixel monitor to run in the background -->
+    <allow-in-power-save package="com.google.android.gnsspixelmonitor" />
 </config>
diff --git a/prebuilt/product/etc/sysconfig/nga.xml b/prebuilt/product/etc/sysconfig/nga.xml
new file mode 100644
index 000000000..b742577a7
--- /dev/null
+++ b/prebuilt/product/etc/sysconfig/nga.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- These are configurations that should exist on devices that support Next Generation Assistant -->
+<config>
+    <!-- This feature is meant to be the feature identifying devices that support NGA -->
+    <feature name="com.google.android.feature.NEXT_GENERATION_ASSISTANT" />
+</config>
diff --git a/prebuilt/product/etc/sysconfig/pixel_2016_exclusive.xml b/prebuilt/product/etc/sysconfig/pixel_2016_exclusive.xml
deleted file mode 100644
index 72addee13..000000000
--- a/prebuilt/product/etc/sysconfig/pixel_2016_exclusive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- These are configurations that should exist on Google's 2016 Pixel devices. -->
-<config>
-    <!-- Both versions of this string are needed due to a miscommunication. b/29978934 -->
-    <feature name="com.google.android.apps.photos.NEXUS_PRELOAD" />
-    <feature name="com.google.android.apps.photos.nexus_preload" />
-
-    <!-- Allow Better Bug to take bug report. -->
-    <bugreport-whitelisted package="com.google.android.apps.betterbug" />
-    <bugreport-whitelisted package="com.google.android.apps.internal.betterbug" />
-</config>
diff --git a/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml b/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
index b2d2e1bbb..7fad17598 100644
--- a/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
+++ b/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
@@ -219,4 +219,39 @@
         <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
         <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
     </install-in-user-type>
+
+    <!-- Screenshots app -->
+    <install-in-user-type package="com.google.android.apps.pixel.agent">
+        <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" />
+        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
+    </install-in-user-type>
+
+    <!-- Pixel Studio app -->
+    <install-in-user-type package="com.google.android.apps.pixel.creativeassistant">
+        <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" />
+        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
+    </install-in-user-type>
+
+    <!-- Find My Device app -->
+    <install-in-user-type package="com.google.android.apps.adm">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
+    </install-in-user-type>
+
+    <!-- Pixel play auto-install (PAI) stub app. Enables phonesky to install
+      certain app prebuilts on device setup or when the first account is added to the user.
+      Preventing stub app installation disables PAI for the user -->
+    <install-in-user-type package="android.autoinstalls.config.google.nexus">
+        <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.PRIVATE" />
+    </install-in-user-type>
 </config>
diff --git a/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml b/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml
index b5b028cbd..982697b81 100644
--- a/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml
+++ b/prebuilt/product/etc/sysconfig/preinstalled-packages-product-pixel-2018-and-newer.xml
@@ -10,4 +10,11 @@
         <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
         <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
     </install-in-user-type>
+
+    <!-- Preinstallation config corresponding to the Pixel buds app-->
+    <install-in-user-type package="com.google.android.apps.wearables.maestro.companion">
+        <install-in user-type="FULL" />
+        <install-in user-type="PROFILE" />
+        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
+    </install-in-user-type>
 </config>