diff --git a/Android.bp b/Android.bp
index e3f68e17dc1..d76ea77fc92 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,6 +105,7 @@ android_library {
         "Settings-change-ids",
         "androidx.room_room-runtime",
         "SystemUIUnfoldLib",
+        "aconfig_settings_flags_lib",
     ],
 
     plugins: ["androidx.room_room-compiler-plugin"],
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
new file mode 100644
index 00000000000..96a2f41c3f8
--- /dev/null
+++ b/aconfig/Android.bp
@@ -0,0 +1,17 @@
+package {
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+aconfig_declarations {
+    name: "aconfig_settings_connecteddevice_flags",
+    package: "com.android.settings.connecteddevice.flags",
+    srcs: [
+        "settings_connecteddevice_flag_declarations.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "aconfig_settings_flags_lib",
+    aconfig_declarations: "aconfig_settings_connecteddevice_flags",
+}
+
diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
new file mode 100644
index 00000000000..edeb35a50df
--- /dev/null
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.settings.connecteddevice.flags"
+
+flag {
+  name: "enable_subsequent_pair_settings_integration"
+  namespace: "pixel_cross_device_control"
+  description: "Gates whether to enable subsequent pair Settings integration."
+  bug: "296507968"
+}