Update ap1a config and remove next, trunk_staging, trunk_food configsandroid-14.0.0_r29android-14.0.0_r28android14-qpr2-s1-release

Flags for release to AOSP, based on AP1A.240305.019 (ab/11415905).

Ignore-AOSP-First: Flags not yet in AOSP
Change-Id: I8adcf56a8cdcddc6a2c9aa53e268072e3de2049b

61 files changed, 297 insertions, 436 deletions

diff --git a/aconfig/ap1a/Android.bp b/aconfig/ap1a/Android.bp
new file mode 100644
index 0000000..9fc8873
--- /dev/null
+++ b/aconfig/ap1a/Android.bp
@@ -0,0 +1,33 @@
+// 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_value_set {
+    name: "aconfig_value_set-ap1a",
+    values: [
+        "aconfig-values-ap1a-com.android.window.flags-all",
+        "aconfig-values-ap1a-com.android.input.flags-all",
+        "aconfig-values-ap1a-com.android.media.flags-all",
+        "aconfig-values-ap1a-com.example.android.aconfig.demo.flags-all",
+        "aconfig-values-ap1a-com.android.systemui.accessibility.accessibilitymenu-all",
+        "aconfig-values-ap1a-com.android.server.display.feature.flags-all",
+        "aconfig-values-ap1a-com.android.server.notification-all",
+        "aconfig-values-ap1a-com.android.graphics.surfaceflinger.flags-all",
+        "aconfig-values-ap1a-com.android.server.companion.virtual-all",
+        "aconfig-values-ap1a-com.android.launcher3-all",
+        "aconfig-values-ap1a-com.android.internal.telephony.flags-all",
+        "aconfig-values-ap1a-android.view.contentprotection.flags-all",
+        "aconfig-values-ap1a-com.android.server.telecom.flags-all",
+        "aconfig-values-ap1a-com.android.settings.flags-all",
+    ],
+}
diff --git a/aconfig/next/com.android.server.companion.virtual/Android.bp b/aconfig/ap1a/android.view.contentprotection.flags/Android.bp
index 29bff82..750ff5a 100644
--- a/aconfig/next/com.android.server.companion.virtual/Android.bp
+++ b/aconfig/ap1a/android.view.contentprotection.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.server.companion.virtual-all",
-  package: "com.android.server.companion.virtual",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-android.view.contentprotection.flags-all",
+    package: "android.view.contentprotection.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/ap1a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto b/aconfig/ap1a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
new file mode 100644
index 0000000..62895e0
--- /dev/null
+++ b/aconfig/ap1a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "blocklist_update_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto b/aconfig/ap1a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
new file mode 100644
index 0000000..4db8f5f
--- /dev/null
+++ b/aconfig/ap1a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "parse_groups_config_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto b/aconfig/ap1a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
new file mode 100644
index 0000000..e855d79
--- /dev/null
+++ b/aconfig/ap1a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "setting_ui_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/ap1a/com.android.graphics.surfaceflinger.flags/Android.bp
new file mode 100644
index 0000000..f9aab35
--- /dev/null
+++ b/aconfig/ap1a/com.android.graphics.surfaceflinger.flags/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.graphics.surfaceflinger.flags-all",
+    package: "com.android.graphics.surfaceflinger.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/next/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto b/aconfig/ap1a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
index 3a68f98..84371a8 100644
--- a/aconfig/next/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
+++ b/aconfig/ap1a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.graphics.surfaceflinger.flags"
   name: "enable_small_area_detection"
diff --git a/aconfig/next/com.android.window.flags/Android.bp b/aconfig/ap1a/com.android.input.flags/Android.bp
index 7e03287..55bfae8 100644
--- a/aconfig/next/com.android.window.flags/Android.bp
+++ b/aconfig/ap1a/com.android.input.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.window.flags-all",
-  package: "com.android.window.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.input.flags-all",
+    package: "com.android.input.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/ap1a/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto b/aconfig/ap1a/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
new file mode 100644
index 0000000..a517714
--- /dev/null
+++ b/aconfig/ap1a/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_gestures_library_timer_provider"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/next/com.android.internal.telephony.flags/Android.bp b/aconfig/ap1a/com.android.internal.telephony.flags/Android.bp
index 81a0555..53e4228 100644
--- a/aconfig/next/com.android.internal.telephony.flags/Android.bp
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.internal.telephony.flags-all",
-  package: "com.android.internal.telephony.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.internal.telephony.flags-all",
+    package: "com.android.internal.telephony.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
index e60b026..8e2deed 100644
--- a/aconfig/next/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.internal.telephony.flags"
   name: "do_not_override_precise_label"
diff --git a/aconfig/next/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto
index aba8290..d180621 100644
--- a/aconfig/next/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.internal.telephony.flags"
   name: "enable_carrier_config_n1_control"
diff --git a/aconfig/ap1a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
new file mode 100644
index 0000000..6da4289
--- /dev/null
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "hide_roaming_icon"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/next/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
index 92b071e..e4e387f 100644
--- a/aconfig/next/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.internal.telephony.flags"
   name: "log_mms_sms_database_access_info"
diff --git a/aconfig/ap1a/com.android.internal.telephony.flags/reject_bad_sub_id_interaction_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/reject_bad_sub_id_interaction_flag_values.textproto
new file mode 100644
index 0000000..dcb5c06
--- /dev/null
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/reject_bad_sub_id_interaction_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "reject_bad_sub_id_interaction"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/next/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto b/aconfig/ap1a/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
index c273cb4..428461c 100644
--- a/aconfig/next/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
+++ b/aconfig/ap1a/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.internal.telephony.flags"
   name: "relax_ho_teardown"
diff --git a/aconfig/next/com.android.media.flags/Android.bp b/aconfig/ap1a/com.android.launcher3/Android.bp
index 85c9027..a1e9e71 100644
--- a/aconfig/next/com.android.media.flags/Android.bp
+++ b/aconfig/ap1a/com.android.launcher3/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.media.flags-all",
-  package: "com.android.media.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.launcher3-all",
+    package: "com.android.launcher3",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto b/aconfig/ap1a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
index 2a27557..3f84cf3 100644
--- a/aconfig/next/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
+++ b/aconfig/ap1a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.launcher3"
   name: "enable_cursor_hover_states"
diff --git a/aconfig/next/com.android.settings.flags/Android.bp b/aconfig/ap1a/com.android.media.flags/Android.bp
index 968a689..28da90c 100644
--- a/aconfig/next/com.android.settings.flags/Android.bp
+++ b/aconfig/ap1a/com.android.media.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.settings.flags-all",
-  package: "com.android.settings.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.media.flags-all",
+    package: "com.android.media.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto b/aconfig/ap1a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
index 466e0e4..74ea00f 100644
--- a/aconfig/next/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
+++ b/aconfig/ap1a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.media.flags"
   name: "adjust_volume_for_foreground_app_playing_audio_without_media_session"
diff --git a/aconfig/ap1a/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto b/aconfig/ap1a/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto
new file mode 100644
index 0000000..9d15050
--- /dev/null
+++ b/aconfig/ap1a/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_waiting_state_for_system_session_creation_request"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto b/aconfig/ap1a/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto
new file mode 100644
index 0000000..4564012
--- /dev/null
+++ b/aconfig/ap1a/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "fallback_to_default_handling_when_media_session_has_fixed_volume_handling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/com.android.server.companion.virtual/Android.bp b/aconfig/ap1a/com.android.server.companion.virtual/Android.bp
new file mode 100644
index 0000000..738ad8b
--- /dev/null
+++ b/aconfig/ap1a/com.android.server.companion.virtual/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.server.companion.virtual-all",
+    package: "com.android.server.companion.virtual",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/next/com.android.server.companion.virtual/dump_history_flag_values.textproto b/aconfig/ap1a/com.android.server.companion.virtual/dump_history_flag_values.textproto
index 98b738d..ddcb135 100644
--- a/aconfig/next/com.android.server.companion.virtual/dump_history_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.companion.virtual/dump_history_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.companion.virtual"
   name: "dump_history"
diff --git a/aconfig/ap1a/com.android.server.display.feature.flags/Android.bp b/aconfig/ap1a/com.android.server.display.feature.flags/Android.bp
new file mode 100644
index 0000000..797c6d3
--- /dev/null
+++ b/aconfig/ap1a/com.android.server.display.feature.flags/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.server.display.feature.flags-all",
+    package: "com.android.server.display.feature.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto b/aconfig/ap1a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
index 64d2ab1..6255d9a 100644
--- a/aconfig/next/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.display.feature.flags"
   name: "enable_adaptive_tone_improvements_1"
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto b/aconfig/ap1a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
index cb55774..b7d18ae 100644
--- a/aconfig/next/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.display.feature.flags"
   name: "enable_hdr_clamper"
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto b/aconfig/ap1a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
index 66e55f4..a3f4e47 100644
--- a/aconfig/next/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.display.feature.flags"
   name: "enable_nbm_controller"
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto b/aconfig/ap1a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
index 73ac12f..3c31c0f 100644
--- a/aconfig/next/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.display.feature.flags"
   name: "enable_power_throttling_clamper"
diff --git a/aconfig/next/com.android.server.notification/Android.bp b/aconfig/ap1a/com.android.server.notification/Android.bp
index 47e6962..0c5c4ec 100644
--- a/aconfig/next/com.android.server.notification/Android.bp
+++ b/aconfig/ap1a/com.android.server.notification/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.server.notification-all",
-  package: "com.android.server.notification",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.server.notification-all",
+    package: "com.android.server.notification",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.android.server.notification/expire_bitmaps_flag_values.textproto b/aconfig/ap1a/com.android.server.notification/expire_bitmaps_flag_values.textproto
index 564b54c..6fb6f65 100644
--- a/aconfig/next/com.android.server.notification/expire_bitmaps_flag_values.textproto
+++ b/aconfig/ap1a/com.android.server.notification/expire_bitmaps_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.server.notification"
   name: "expire_bitmaps"
diff --git a/aconfig/ap1a/com.android.server.telecom.flags/Android.bp b/aconfig/ap1a/com.android.server.telecom.flags/Android.bp
new file mode 100644
index 0000000..ad3477b
--- /dev/null
+++ b/aconfig/ap1a/com.android.server.telecom.flags/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.server.telecom.flags-all",
+    package: "com.android.server.telecom.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap1a/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto b/aconfig/ap1a/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto
new file mode 100644
index 0000000..b64c657
--- /dev/null
+++ b/aconfig/ap1a/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "ignore_auto_route_to_watch_device"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap1a/com.android.settings.flags/Android.bp b/aconfig/ap1a/com.android.settings.flags/Android.bp
new file mode 100644
index 0000000..fceb53b
--- /dev/null
+++ b/aconfig/ap1a/com.android.settings.flags/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.settings.flags-all",
+    package: "com.android.settings.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/next/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto b/aconfig/ap1a/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
index 45a55f0..19c747b 100644
--- a/aconfig/next/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
+++ b/aconfig/ap1a/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.settings.flags"
   name: "enable_subsequent_pair_settings_integration"
diff --git a/aconfig/ap1a/com.android.systemui.accessibility.accessibilitymenu/Android.bp b/aconfig/ap1a/com.android.systemui.accessibility.accessibilitymenu/Android.bp
new file mode 100644
index 0000000..5ea9cd7
--- /dev/null
+++ b/aconfig/ap1a/com.android.systemui.accessibility.accessibilitymenu/Android.bp
@@ -0,0 +1,21 @@
+// 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-ap1a-com.android.systemui.accessibility.accessibilitymenu-all",
+    package: "com.android.systemui.accessibility.accessibilitymenu",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/next/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_settings_back_button_fix_and_large_button_sizing_flag_values.textproto b/aconfig/ap1a/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_settings_back_button_fix_and_large_button_sizing_flag_values.textproto
index e0416fc..c9fb180 100644
--- a/aconfig/next/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_settings_back_button_fix_and_large_button_sizing_flag_values.textproto
+++ b/aconfig/ap1a/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_settings_back_button_fix_and_large_button_sizing_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.systemui.accessibility.accessibilitymenu"
   name: "a11y_menu_settings_back_button_fix_and_large_button_sizing"
diff --git a/aconfig/next/com.android.launcher3/Android.bp b/aconfig/ap1a/com.android.window.flags/Android.bp
index cb7e1ca..db176c1 100644
--- a/aconfig/next/com.android.launcher3/Android.bp
+++ b/aconfig/ap1a/com.android.window.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.launcher3-all",
-  package: "com.android.launcher3",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.android.window.flags-all",
+    package: "com.android.window.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.android.window.flags/surface_trusted_overlay_flag_values.textproto b/aconfig/ap1a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
index 2d96855..dff3478 100644
--- a/aconfig/next/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
+++ b/aconfig/ap1a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.android.window.flags"
   name: "surface_trusted_overlay"
diff --git a/aconfig/ap1a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto b/aconfig/ap1a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
new file mode 100644
index 0000000..8736ae3
--- /dev/null
+++ b/aconfig/ap1a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "wallpaper_offset_async"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/next/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/ap1a/com.example.android.aconfig.demo.flags/Android.bp
index 3f4135c..e737922 100644
--- a/aconfig/next/com.android.graphics.surfaceflinger.flags/Android.bp
+++ b/aconfig/ap1a/com.example.android.aconfig.demo.flags/Android.bp
@@ -1,5 +1,4 @@
-
-// Copyright 2023 Google Inc. All rights reserved.
+// 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.
@@ -14,9 +13,9 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-next-com.android.graphics.surfaceflinger.flags-all",
-  package: "com.android.graphics.surfaceflinger.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
+    name: "aconfig-values-ap1a-com.example.android.aconfig.demo.flags-all",
+    package: "com.example.android.aconfig.demo.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
 }
diff --git a/aconfig/next/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto b/aconfig/ap1a/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto
index 7726fa5..72cb327 100644
--- a/aconfig/next/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto
+++ b/aconfig/ap1a/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto
@@ -1,4 +1,3 @@
-
 flag_value {
   package: "com.example.android.aconfig.demo.flags"
   name: "test_flag_gantry"
diff --git a/aconfig/next/Android.bp b/aconfig/next/Android.bp
deleted file mode 100644
index f16478b..0000000
--- a/aconfig/next/Android.bp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2023 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_value_set {
-    name: "aconfig_value_set-aosp-next",
-    values: [
-        "aconfig-values-aosp-next-com.android.graphics.surfaceflinger.flags-all",
-        "aconfig-values-aosp-next-com.android.internal.telephony.flags-all",
-        "aconfig-values-aosp-next-com.android.launcher3-all",
-        "aconfig-values-aosp-next-com.android.media.flags-all",
-        "aconfig-values-aosp-next-com.android.server.companion.virtual-all",
-        "aconfig-values-aosp-next-com.android.server.display.feature.flags-all",
-        "aconfig-values-aosp-next-com.android.server.notification-all",
-        "aconfig-values-aosp-next-com.android.settings.flags-all",
-        "aconfig-values-aosp-next-com.android.systemui.accessibility.accessibilitymenu-all",
-        "aconfig-values-aosp-next-com.android.window.flags-all",
-        "aconfig-values-aosp-next-com.example.android.aconfig.demo.flags-all",
-        "aconfig_values-aosp-next-all"
-    ]
-}
-
-aconfig_values {
-    name: "aconfig_values-aosp-next-all",
-    package: "com.android.all",
-    srcs: [
-        "flag_values.textproto",
-    ]
-}
diff --git a/aconfig/next/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto b/aconfig/next/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
deleted file mode 100644
index 4d7ff3a..0000000
--- a/aconfig/next/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-flag_value {
-  package: "com.android.graphics.surfaceflinger.flags"
-  name: "connected_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/next/com.android.server.display.feature.flags/Android.bp b/aconfig/next/com.android.server.display.feature.flags/Android.bp
deleted file mode 100644
index 9bb1390..0000000
--- a/aconfig/next/com.android.server.display.feature.flags/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// Copyright 2023 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-aosp-next-com.android.server.display.feature.flags-all",
-  package: "com.android.server.display.feature.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto b/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
deleted file mode 100644
index 432e0ef..0000000
--- a/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_connected_display_error_handling"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto b/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
deleted file mode 100644
index 9a0fa74..0000000
--- a/aconfig/next/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_connected_display_management"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/next/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto b/aconfig/next/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
deleted file mode 100644
index 9a7a58d..0000000
--- a/aconfig/next/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
+++ /dev/null
@@ -1,7 +0,0 @@
-
-flag_value {
-  package: "com.android.server.display.feature.flags"
-  name: "enable_mode_limit_for_external_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/next/com.android.systemui.accessibility.accessibilitymenu/Android.bp b/aconfig/next/com.android.systemui.accessibility.accessibilitymenu/Android.bp
deleted file mode 100644
index 78eedb1..0000000
--- a/aconfig/next/com.android.systemui.accessibility.accessibilitymenu/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// Copyright 2023 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-aosp-next-com.android.systemui.accessibility.accessibilitymenu-all",
-  package: "com.android.systemui.accessibility.accessibilitymenu",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/next/com.example.android.aconfig.demo.flags/Android.bp b/aconfig/next/com.example.android.aconfig.demo.flags/Android.bp
deleted file mode 100644
index f86b4b1..0000000
--- a/aconfig/next/com.example.android.aconfig.demo.flags/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-// Copyright 2023 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-aosp-next-com.example.android.aconfig.demo.flags-all",
-  package: "com.example.android.aconfig.demo.flags",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/next/flag_values.textproto b/aconfig/next/flag_values.textproto
deleted file mode 100644
index e69de29..0000000
--- a/aconfig/next/flag_values.textproto
+++ /dev/null
diff --git a/aconfig/trunk_food/Android.bp b/aconfig/trunk_food/Android.bp
deleted file mode 100644
index 3db6552..0000000
--- a/aconfig/trunk_food/Android.bp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 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_value_set {
-    name: "aconfig_value_set-aosp-trunk_food",
-    values: [
-        "aconfig_values-aosp-trunk_food-all"
-    ]
-}
-
-aconfig_values {
-    name: "aconfig_values-aosp-trunk_food-all",
-    package: "com.android.all",
-    srcs: [
-        "flag_values.textproto",
-    ]
-}
diff --git a/aconfig/trunk_food/flag_values.textproto b/aconfig/trunk_food/flag_values.textproto
deleted file mode 100644
index e69de29..0000000
--- a/aconfig/trunk_food/flag_values.textproto
+++ /dev/null
diff --git a/aconfig/trunk_staging/Android.bp b/aconfig/trunk_staging/Android.bp
deleted file mode 100644
index 7c40321..0000000
--- a/aconfig/trunk_staging/Android.bp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2023 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_value_set {
-    name: "aconfig_value_set-aosp-trunk_staging",
-    values: [
-        "aconfig_values-aosp-trunk_staging-all"
-    ]
-}
-
-aconfig_values {
-    name: "aconfig_values-aosp-trunk_staging-all",
-    package: "com.android.all",
-    srcs: [
-        "flag_values.textproto",
-    ]
-}
diff --git a/aconfig/trunk_staging/flag_values.textproto b/aconfig/trunk_staging/flag_values.textproto
deleted file mode 100644
index e69de29..0000000
--- a/aconfig/trunk_staging/flag_values.textproto
+++ /dev/null
diff --git a/build_config/next.scl b/build_config/ap1a.scl
index 9d9d217..093bf07 100644
--- a/build_config/next.scl
+++ b/build_config/ap1a.scl
@@ -1,6 +1,3 @@
-"""
-Build flag values for release config next.
-"""
 # Copyright (C) 2023 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,31 +13,29 @@ Build flag values for release config next.
 # limitations under the License.
 
 #
-# Build system flag configuration for `lunch <product>-next-<variant>` builds
+# Build system flag configuration for `lunch <product>-ap1a-<variant>` builds
 #                                                      ^^^^
 # See go/build-system-flags
 #
 
 load("//build/make/core/release_config.scl", "value")
 
-# Platform version variables
-platform_version_flags = [
-    value("RELEASE_PLATFORM_VERSION", "UP1A"),
-    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
+# Flags are sorted alphabetical by flag name to reduce merge conflicts
+values = [
+    # keep-sorted start numeric=yes
+    value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"),
+    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-ap1a"),
+    value("RELEASE_AIDL_USE_UNFROZEN", False),
+    value("RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE", False),
+    value("RELEASE_EXPOSE_FLAGGED_API", True),
     value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
+    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
     value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-03-05"),
-    value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"),
+    value("RELEASE_PLATFORM_VERSION", "AP1A"),
     value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "REL"),
     value("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", "REL,VanillaIceCream"),
+    value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"),
     value("RELEASE_PLATFORM_VERSION_LAST_STABLE", "14"),
     value("RELEASE_PLATFORM_VNDK_VERSION", "35"),
+    # keep-sorted end
 ]
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"),
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-next"),
-    value("RELEASE_AIDL_USE_UNFROZEN", False),
-    value("RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE", False),
-    value("RELEASE_EXPOSE_FLAGGED_API", True),
-] + platform_version_flags
diff --git a/build_config/trunk.scl b/build_config/trunk.scl
deleted file mode 100644
index 0ec92c7..0000000
--- a/build_config/trunk.scl
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Build flag values for release config trunk.
-"""
-# Copyright (C) 2023 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.
-
-#
-# Build system flag configuration for `lunch <product>-trunk-<variant>` builds
-#                                                      ^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-load("//build/release/build_config/trunk_versions.scl", "platform_version_flags")
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk"),
-    value("RELEASE_ANGLE_ON_SYSTEM", True),
-    value("RELEASE_DEPRECATE_VNDK", True),
-] + platform_version_flags
diff --git a/build_config/trunk_food.scl b/build_config/trunk_food.scl
deleted file mode 100644
index 54a296d..0000000
--- a/build_config/trunk_food.scl
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Build flag values for release config trunk_food.
-"""
-# Copyright (C) 2023 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.
-
-#
-# Build system flag configuration for `lunch <product>-trunk_food-<variant>` builds
-#                                                      ^^^^^^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-
-################################################################################
-#
-# DO NOT EDIT THIS FILE
-#
-# Flag values should be changed in `trunk.scl`, not here.  This file should
-# only be used where trunk_food differs from trunk: RELEASE_ACONFIG_VALUE_SETS
-# is the only difference at this time.
-################################################################################
-values = [
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk_food"),
-]
diff --git a/build_config/trunk_staging.scl b/build_config/trunk_staging.scl
deleted file mode 100644
index 7423a06..0000000
--- a/build_config/trunk_staging.scl
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-Build flag values for release config trunk_staging.
-"""
-# Copyright (C) 2023 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.
-
-#
-# Build system flag configuration for `lunch <product>-trunk_staging-<variant>` builds
-#                                                      ^^^^^^^^^^^^^
-# See go/build-system-flags
-#
-
-load("//build/make/core/release_config.scl", "value")
-load("//build/release/build_config/trunk_versions.scl", "platform_version_flags")
-
-# Flags should be alphabetical by flag name to reduce merge conflifcts
-values = [
-    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-trunk_staging"),
-    value("RELEASE_ANGLE_ON_SYSTEM", True),
-    value("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", True),
-    value("RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT", True),
-    value("RELEASE_AVF_ENABLE_DICE_CHANGES", True),
-    value("RELEASE_AVF_ENABLE_LLPVM_CHANGES", True),
-    value("RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM", True),
-    value("RELEASE_AVF_ENABLE_REMOTE_ATTESTATION", True),
-    value("RELEASE_AVF_ENABLE_VENDOR_MODULES", True),
-    value("RELEASE_PACKAGE_VIRTUAL_CAMERA", "virtual_camera"),
-    value("RELEASE_DEPRECATE_VNDK", True),
-    value("RELEASE_BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI", True),
-    value("RELEASE_NDK_ABI_MONITORED", True),
-] + platform_version_flags
diff --git a/build_flags.scl b/build_flags.scl
index f265605..e3e83fd 100644
--- a/build_flags.scl
+++ b/build_flags.scl
@@ -49,29 +49,6 @@ flags = [
     # Move ANGLE libraries from vendor partition to system partition.
     flag("RELEASE_ANGLE_ON_SYSTEM", ALL, False),
 
-    # The contributions made by apexes (source or prebuilts) to the rest of the build.
-    flag("RELEASE_APEX_CONTRIBUTIONS_ADSERVICES", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_APPSEARCH", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_ART", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_BLUETOOTH", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_CONFIGINFRASTRUCTURE", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_CONNECTIVITY", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_CONSCRYPT", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_CRASHRECOVERY", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_DEVICELOCK", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_HEALTHFITNESS", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_IPSEC", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_MEDIA", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_MEDIAPROVIDER", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_ONDEVICEPERSONALIZATION", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_PERMISSION", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_REMOTEKEYPROVISIONING", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_SCHEDULING", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_SDKEXTENSIONS", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_STATSD", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_UWB", ALL, None),
-    flag("RELEASE_APEX_CONTRIBUTIONS_WIFI", ALL, None),
-
     # Enables acces to the AVF APIs to pre-installed apps.
     flag("RELEASE_AVF_ALLOW_PREINSTALLED_APPS", SYSTEM, False),
 
@@ -122,14 +99,21 @@ flags = [
     # Enables ABI monitoring of NDK libraries.
     flag("RELEASE_NDK_ABI_MONITORED", ALL, False),
 
+    # b/292140387: Flag to switch to the new NFC apex
+    flag("RELEASE_PACKAGE_NFC_STACK", SYSTEM, "NfcNci"),
+
     # This flag will control the rollout of new versions of the SoundPicker app.
     flag("RELEASE_PACKAGE_SOUND_PICKER", ALL, "SoundPicker"),
 
     # The name of the virtual camera package to add to the system partition.
     flag("RELEASE_PACKAGE_VIRTUAL_CAMERA", SYSTEM, ""),
 
-    # The platform version. This is the 4 letter code, e.g. UD1A, UPB1, ZP1A, etc.
-    flag("RELEASE_PLATFORM_VERSION", ALL, "ZP1A"),
+    # The sdk extension version of this release configuration.
+    flag("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", ALL, "11"),
+
+    # The SDK version of the platform, e.g. 34 for UDC. This should only be increased
+    # when the API is finalized and the codename is set to rel, not during development.
+    flag("RELEASE_PLATFORM_SDK_VERSION", ALL, "34"),
 
     #  Used to indicate the security patch that has been applied to the device.
     #  It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin.
@@ -138,16 +122,8 @@ flags = [
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
     flag("RELEASE_PLATFORM_SECURITY_PATCH", ALL, "2023-12-05"),
 
-    # The SDK version of the platform, e.g. 34 for UDC. This should only be increased
-    # when the API is finalized and the codename is set to rel, not during development.
-    flag("RELEASE_PLATFORM_SDK_VERSION", ALL, "34"),
-
-    # The sdk extension version of this release configuration.
-    flag("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", ALL, "11"),
-
-    # Set to REL for production platform builds, otherwise the codename string,
-    # e.g. UpsideDownCake or VanillaIceCream
-    flag("RELEASE_PLATFORM_VERSION_CODENAME", ALL, "VanillaIceCream"),
+    # The platform version. This is the 4 letter code, e.g. UD1A, UPB1, ZP1A, etc.
+    flag("RELEASE_PLATFORM_VERSION", ALL, "ZP1A"),
 
     # A comma separated list of all codenames that are in preview.
     # This variable is sort of a lie for historical reasons and only
@@ -157,6 +133,10 @@ flags = [
     # A comma separated list of all preview codenames the platform will accept apps built against
     flag("RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES", ALL, "UpsideDownCake,VanillaIceCream"),
 
+    # Set to REL for production platform builds, otherwise the codename string,
+    # e.g. UpsideDownCake or VanillaIceCream
+    flag("RELEASE_PLATFORM_VERSION_CODENAME", ALL, "VanillaIceCream"),
+
     # A comma separated list of all known codenames.
     # For REL (finalized) configurations, it has to only contain finalized codenames.
     flag("RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES", ALL, "Base,Base11,Cupcake,Donut,Eclair,Eclair01,EclairMr1,Froyo,Gingerbread,GingerbreadMr1,Honeycomb,HoneycombMr1,HoneycombMr2,IceCreamSandwich,IceCreamSandwichMr1,JellyBean,JellyBeanMr1,JellyBeanMr2,Kitkat,KitkatWatch,Lollipop,LollipopMr1,M,N,NMr1,O,OMr1,P,Q,R,S,Sv2,Tiramisu,UpsideDownCake,VanillaIceCream"),
@@ -173,7 +153,4 @@ flags = [
 
     # feature flag for removing legacy emoji font from system image.
     flag("RELEASE_REMOVE_LEGACY_EMOJI_FONT", SYSTEM, False),
-
-    # b/292140387: Flag to switch to the new NFC apex
-    flag("RELEASE_PACKAGE_NFC_STACK", SYSTEM, "NfcNci"),
-]
+]
\ No newline at end of file
diff --git a/release_config_map.mk b/release_config_map.mk
index 9d1dae2..a986079 100644
--- a/release_config_map.mk
+++ b/release_config_map.mk
@@ -20,12 +20,6 @@ local_dir := $(dir $(lastword $(MAKEFILE_LIST)))
 FLAG_DECLARATION_FILES := $(local_dir)build_flags.scl
 
 # Attach the flag value definitions to the various release configurations.
-$(call declare-release-config, next, $(local_dir)build_config/next.scl)
-$(call declare-release-config, trunk, $(local_dir)build_config/trunk.scl)
-$(call declare-release-config, trunk_food, $(local_dir)build_config/trunk_food.scl, trunk)
-$(call declare-release-config, trunk_staging, $(local_dir)build_config/trunk_staging.scl)
-
-# Temporary, until we remove the old "staging" configs
-$(call declare-release-config, staging, $(local_dir)build_config/trunk_staging.scl)
+$(call declare-release-config, ap1a, $(local_dir)build_config/ap1a.scl)
 
 local_dir :=