diff --git a/release/aconfig/bp1a/Android.bp b/release/aconfig/bp1a/Android.bp
index 4b782decc1f173161adfb08eca57883df094fe1d..4dad955588855b68d762411df72c9c6b8b499bc8 100644
--- a/release/aconfig/bp1a/Android.bp
+++ b/release/aconfig/bp1a/Android.bp
@@ -24,5 +24,6 @@ aconfig_value_set {
         "aconfig-values-bp1a-com.android.permission.flags-all",
         "aconfig-values-bp1a-com.android.settings.flags-all",
         "aconfig-values-bp1a-com.android.window.flags-all",
+        "aconfig-values-bp1a-com.android.wm.shell-all",
     ],
 }
diff --git a/release/aconfig/bp1a/com.android.wm.shell/Android.bp b/release/aconfig/bp1a/com.android.wm.shell/Android.bp
new file mode 100644
index 0000000000000000000000000000000000000000..735fb1cc7a2134b43fc4ca575e87800e0416c92b
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.wm.shell/Android.bp
@@ -0,0 +1,21 @@
+// Copyright 2025 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-bp1a-com.android.wm.shell-all",
+  package: "com.android.wm.shell",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..3371a08065c5bc417281f957b0853e5392709c4b
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_taskbar_navbar_unification"
+  state: DISABLED
+  permission: READ_ONLY
+}
diff --git a/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto
new file mode 100644
index 0000000000000000000000000000000000000000..76c5db602131c62cdd307b7ba247dce067944186
--- /dev/null
+++ b/release/aconfig/bp1a/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_taskbar_on_phones"
+  state: DISABLED
+  permission: READ_ONLY
+}