diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index f485869812a..eb9a6b4155b 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -6,17 +6,7 @@ aconfig_declarations {
     name: "aconfig_settings_flags",
     package: "com.android.settings.flags",
     srcs: [
-        "settings_accessibility_flag_declarations.aconfig",
-        "settings_connecteddevice_flag_declarations.aconfig",
-        "settings_development_flag_declarations.aconfig",
-        "settings_globalintl_flag_declarations.aconfig",
-        "settings_experience_flag_declarations.aconfig",
-	"settings_notification_flag_declarations.aconfig",
-        "settings_onboarding_experience_flag_declarations.aconfig",
-        "settings_telephony_flag_declarations.aconfig",
-        "settings_biometrics_integration_declarations.aconfig",
-        "settings_voice_activation_apps_flag_declarations.aconfig",
-        "settings_biometrics_framework_flag_declarations.aconfig",
+        "*.aconfig",
     ],
 }
 
diff --git a/aconfig/settings_panel_flag_declarations.aconfig b/aconfig/settings_panel_flag_declarations.aconfig
new file mode 100644
index 00000000000..10eb655f20c
--- /dev/null
+++ b/aconfig/settings_panel_flag_declarations.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.settings.flags"
+
+flag {
+  name: "enable_volume_plus_quick_settings"
+  namespace: "pixel_cross_device_control"
+  description: "Gates whether to enable VolumePlus quick settings panel."
+  bug: "309052662"
+}