diff --git a/system/etc/default-permissions/default-permissions.xml b/system/etc/default-permissions/default-permissions.xml
deleted file mode 100644
index 5712aa5..0000000
--- a/system/etc/default-permissions/default-permissions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-
-<!-- Copyright (C) 2019 Google Inc.
-
-    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 file contains permissions to be granted by default. Default
-    permissions are granted to special platform components and to apps
-    that are approved to get default grants. The special components
-    are apps that are expected tto work out-of-the-box as they provide
-    core use cases such as default dialer, default email, etc. These
-    grants are managed by the platform. The apps that are additionally
-    approved for default grants are ones that provide carrier specific
-    functionality, ones legally required at some location, ones providing
-    alternative disclosure and opt-out UI, ones providing highlight features
-    of a dedicated device, etc. This file contains only the latter exceptions.
-    Fixed permissions cannot be controlled by the user and need a special
-    approval. Typically these are to ensure either legally mandated functions
-    or the app is considered a part of the OS.
--->
-
-<exceptions>
-    <exception
-            package="com.google.android.projection.gearhead">
-        <!-- Gearhead legacy -->
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
-        <permission name="android.permission.CALL_PHONE" fixed="false"/>
-        <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
-        <permission name="android.permission.READ_CONTACTS" fixed="false"/>
-        <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
-        <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
-        <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
-        <permission name="android.permission.SEND_SMS" fixed="false"/>
-        <permission name="android.permission.READ_CALENDAR" fixed="false"/>
-        <!-- For Top Gear -->
-        <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/>
-        <permission name="android.permission.READ_SMS" fixed="false"/>
-        <permission name="android.permission.RECEIVE_MMS" fixed="false"/>
-        <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
-        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
-    </exception>
-</exceptions>
diff --git a/system/etc/permissions/privapp-permissions-com.google.android.projection.gearhead.xml b/system/etc/permissions/privapp-permissions-com.google.android.projection.gearhead.xml
deleted file mode 100644
index 5231347..0000000
--- a/system/etc/permissions/privapp-permissions-com.google.android.projection.gearhead.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<permissions>
-  <privapp-permissions package="com.google.android.projection.gearhead">
-    <permission name="android.permission.READ_PHONE_STATE" />
-    <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-    <permission name="android.permission.CALL_PHONE" />
-    <permission name="android.permission.READ_CALL_LOG" />
-    <permission name="android.permission.READ_CONTACTS" />
-    <permission name="android.permission.GET_ACCOUNTS" />
-    <permission name="android.permission.ACCESS_FINE_LOCATION" />
-    <permission name="com.google.android.gms.permission.CAR_SPEED" />
-    <permission name="android.permission.RECEIVE_SMS" />
-    <permission name="android.permission.SEND_SMS" />
-    <permission name="android.permission.RECORD_AUDIO" />
-    <permission name="android.permission.READ_CALENDAR" />
-    <permission name="android.permission.WAKE_LOCK" />
-    <permission name="android.permission.INTERNET" />
-    <permission name="android.permission.ACCESS_NETWORK_STATE" />
-    <permission name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-    <permission name="android.permission.ACCESS_WIFI_STATE" />
-    <permission name="android.permission.CHANGE_NETWORK_STATE" />
-    <permission name="android.permission.QUERY_ALL_PACKAGES" />
-    <permission name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
-    <permission name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <permission name="android.permission.BLUETOOTH" />
-    <permission name="android.permission.BLUETOOTH_ADMIN" />
-    <permission name="android.permission.CHANGE_WIFI_STATE" />
-    <permission name="android.permission.FOREGROUND_SERVICE" />
-    <permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <permission name="android.permission.VIBRATE" />
-    <permission name="com.google.android.finsky.permission.GEARHEAD_SERVICE" />
-    <permission name="android.permission.WRITE_SETTINGS" />
-    <permission name="android.permission.BLUETOOTH_PRIVILEGED" />
-    <permission name="android.permission.CALL_PRIVILEGED" />
-    <permission name="android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS" />
-    <permission name="android.permission.LOCATION_HARDWARE" />
-    <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.MANAGE_USB" />
-    <permission name="android.permission.MODIFY_AUDIO_ROUTING" />
-    <permission name="android.permission.MODIFY_DAY_NIGHT_MODE" />
-    <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
-    <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION" />
-    <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
-    <permission name="android.permission.INTERACT_ACROSS_PROFILES" />
-  </privapp-permissions>
-</permissions>
diff --git a/system/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk b/system/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk
deleted file mode 100644
index 971e1ee..0000000
Binary files a/system/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk and /dev/null differ
diff --git a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libgmm-jni.so b/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libgmm-jni.so
deleted file mode 100644
index 665a9a6..0000000
Binary files a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libgmm-jni.so and /dev/null differ
diff --git a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libhwrword.so b/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libhwrword.so
deleted file mode 100644
index fe102c2..0000000
Binary files a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libhwrword.so and /dev/null differ
diff --git a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libsslwrapper_jni.so b/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libsslwrapper_jni.so
deleted file mode 100644
index cde2b60..0000000
Binary files a/system/priv-app/AndroidAutoStubPrebuilt/lib/arm64/libsslwrapper_jni.so and /dev/null differ
diff --git a/system/product/etc/permissions/com.google.android.projection.gearhead.xml b/system/product/etc/permissions/com.google.android.projection.gearhead.xml
new file mode 100755
index 0000000..8b0c623
--- /dev/null
+++ b/system/product/etc/permissions/com.google.android.projection.gearhead.xml
@@ -0,0 +1,62 @@
+<permissions>
+  <privapp-permissions package="com.google.android.projection.gearhead">
+    <permission name="android.permission.WAKE_LOCK" />
+  <permission name="android.permission.INTERNET" />
+  <permission name="android.permission.ACCESS_NETWORK_STATE" />
+  <permission name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+  <permission name="android.permission.ACCESS_WIFI_STATE" />
+  <permission name="android.permission.CHANGE_NETWORK_STATE" />
+  <permission name="android.permission.QUERY_ALL_PACKAGES" />
+  <permission name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+  <permission name="android.permission.SYSTEM_ALERT_WINDOW" />
+  <permission name="android.permission.BLUETOOTH" />
+  <permission name="android.permission.BLUETOOTH_ADMIN" />
+  <permission name="android.permission.CHANGE_WIFI_STATE" />
+  <permission name="android.permission.FOREGROUND_SERVICE" />
+  <permission name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <permission name="android.permission.VIBRATE" />
+  <permission name="android.permission.SCHEDULE_EXACT_ALARM" />
+  <permission name="com.google.android.finsky.permission.GEARHEAD_SERVICE" />
+  <permission name="androidx.car.app.NAVIGATION_TEMPLATES" />
+  <permission name="androidx.car.app.ACCESS_SURFACE" />
+  <permission name="android.permission.CALL_PHONE" />
+  <permission name="android.permission.READ_PHONE_STATE" />
+  <permission name="android.permission.READ_CALL_LOG" />
+  <permission name="android.permission.READ_CONTACTS" />
+  <permission name="android.permission.ACCESS_FINE_LOCATION" />
+  <permission name="android.permission.ACCESS_COARSE_LOCATION" />
+  <permission name="com.google.android.gms.permission.CAR_SPEED" />
+  <permission name="android.permission.RECEIVE_SMS" />
+  <permission name="android.permission.SEND_SMS" />
+  <permission name="android.permission.RECORD_AUDIO" />
+  <permission name="android.permission.READ_CALENDAR" />
+  <permission name="android.permission.BLUETOOTH_SCAN" />
+  <permission name="android.permission.BLUETOOTH_CONNECT" />
+  <permission name="android.permission.POST_NOTIFICATIONS" />
+  <permission name="android.permission.ACTIVITY_EMBEDDING" />
+  <permission name="android.permission.BLUETOOTH_PRIVILEGED" />
+  <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.LOCATION_HARDWARE" />
+  <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.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.REQUEST_COMPANION_SELF_MANAGED" />
+  <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
+  <permission name="android.permission.UPDATE_APP_OPS_STATS" />
+  <permission name="android.permission.INTERACT_ACROSS_PROFILES" />
+  <permission name="android.permission.WRITE_SETTINGS" />
+  <permission name="com.google.android.projection.gearhead.permission.START_PROJECTED_ACTIVITY" />
+  <permission name="com.google.android.projection.gearhead.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" />
+  <permission name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY" />
+  <permission name="android.permission.CREATE_VIRTUAL_DEVICE" />
+  <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION" />
+  <permission name="android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION" />
+  </privapp-permissions>
+</permissions>
diff --git a/system/product/overlay/AndroidAutoOverlay.apk b/system/product/overlay/AndroidAutoOverlay.apk
new file mode 100755
index 0000000..7bcdc4c
Binary files /dev/null and b/system/product/overlay/AndroidAutoOverlay.apk differ
diff --git a/system/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk b/system/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk
new file mode 100755
index 0000000..1037d24
Binary files /dev/null and b/system/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk differ