diff --git a/vendor/google/tvstock/device-partial.mk b/vendor/google/tvstock/device-partial.mk
index 12377249605..8c1205b4255 100644
--- a/vendor/google/tvstock/device-partial.mk
+++ b/vendor/google/tvstock/device-partial.mk
@@ -38,6 +38,7 @@ PRODUCT_PACKAGES += \
 	TVRecommendations \
 	ATVOverlay \
 	ATVSettingsProviderOverlay \
+	ATVSettingsOverlay \
 	AtvRemoteService \
 	GoogleServicesFramework \
 	GoogleFeedback \
diff --git a/vendor/google/tvstock/overlay/ATVSettingsOverlay/Android.bp b/vendor/google/tvstock/overlay/ATVSettingsOverlay/Android.bp
new file mode 100644
index 00000000000..763ab1426b8
--- /dev/null
+++ b/vendor/google/tvstock/overlay/ATVSettingsOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "ATVSettingsOverlay",
+    product_specific: true
+}
diff --git a/vendor/google/tvstock/overlay/ATVSettingsOverlay/AndroidManifest.xml b/vendor/google/tvstock/overlay/ATVSettingsOverlay/AndroidManifest.xml
new file mode 100644
index 00000000000..15b5df8154c
--- /dev/null
+++ b/vendor/google/tvstock/overlay/ATVSettingsOverlay/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.friendlyelec.atvsettingsoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.tv.settings" android:priority="1223" android:isStatic="true" />
+</manifest>
diff --git a/vendor/google/tvstock/overlay/ATVSettingsOverlay/res/values/config.xml b/vendor/google/tvstock/overlay/ATVSettingsOverlay/res/values/config.xml
new file mode 100644
index 00000000000..14b4696c24a
--- /dev/null
+++ b/vendor/google/tvstock/overlay/ATVSettingsOverlay/res/values/config.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+<resources>
+
+    <!-- Display additional System Update menu if true -->
+    <bool name="config_additional_system_update_setting_enable">true</bool>
+
+    <string name="additional_system_update" translatable="false">com.google.android.gms</string>
+    <string name="additional_system_update_menu" translatable="false">
+        com.google.android.gms.update.SystemUpdatePanoActivity
+    </string>
+
+    <!-- Allow overlay to specify the default component -->
+    <string name="config_system_update_component" translatable="false">
+        org.lineageos.updater/org.lineageos.updater.UpdatesActivity
+    </string>
+
+    <!-- Determines whether the "Take bug report" option is shown in quick settings. -->
+    <bool name="config_quick_settings_show_take_bugreport">false</bool>
+
+</resources>