diff --git a/release/aconfig/bp2a/Android.bp b/release/aconfig/bp2a/Android.bp
index 0d6c01ae..1efae654 100644
--- a/release/aconfig/bp2a/Android.bp
+++ b/release/aconfig/bp2a/Android.bp
@@ -2,5 +2,6 @@ aconfig_value_set {
     name: "aconfig_value_set-minus-bp2a",
     values: [
         "aconfig-values-bp2a-com.android.launcher3-all",
+        "aconfig-values-bp2a-com.android.settings.flags-all",
     ],
 }
diff --git a/release/aconfig/bp2a/com.android.settings.flags/Android.bp b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
new file mode 100644
index 00000000..35127b0d
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright 2024 Google Inc. All rights reserved.
+//
+// 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.
+
+aconfig_values {
+    name: "aconfig-values-bp2a-com.android.settings.flags-all",
+    package: "com.android.settings.flags",
+    srcs: [
+        "*.textproto",
+    ],
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/enable_battery_level_display.textproto b/release/aconfig/bp2a/com.android.settings.flags/enable_battery_level_display.textproto
new file mode 100644
index 00000000..d55e94e2
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/enable_battery_level_display.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_battery_level_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/enable_hub_mode_settings_on_mobile.textproto b/release/aconfig/bp2a/com.android.settings.flags/enable_hub_mode_settings_on_mobile.textproto
new file mode 100644
index 00000000..0f07b3cc
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/enable_hub_mode_settings_on_mobile.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_hub_mode_settings_on_mobile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/enable_nearby_share_entrypoint.textproto b/release/aconfig/bp2a/com.android.settings.flags/enable_nearby_share_entrypoint.textproto
new file mode 100644
index 00000000..d9a3c8ec
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/enable_nearby_share_entrypoint.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_nearby_share_entrypoint"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/enable_nested_toggle_switches.textproto b/release/aconfig/bp2a/com.android.settings.flags/enable_nested_toggle_switches.textproto
new file mode 100644
index 00000000..f98d51e1
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/enable_nested_toggle_switches.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_nested_toggle_switches"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/release/aconfig/bp2a/com.android.settings.flags/updated_suggestion_card_aosp_flag_values.textproto b/release/aconfig/bp2a/com.android.settings.flags/updated_suggestion_card_aosp_flag_values.textproto
new file mode 100644
index 00000000..42553ade
--- /dev/null
+++ b/release/aconfig/bp2a/com.android.settings.flags/updated_suggestion_card_aosp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "updated_suggestion_card_aosp"
+  state: ENABLED
+  permission: READ_ONLY
+}