Updating build flag in RELEASE_CONFIG_TRUNKFOOD_STAGING: am: e52ec4962a

Original change: https://android-review.googlesource.com/c/platform/build/release/+/3406720

Change-Id: I7652e79fecf41fa8a80b351bdb2a7b8f13696934
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/aconfig/ap2a/Android.bp b/aconfig/ap2a/Android.bp
new file mode 100644
index 0000000..8f28b15
--- /dev/null
+++ b/aconfig/ap2a/Android.bp
@@ -0,0 +1,40 @@
+// 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-aosp-ap2a",
+    values: [
+        "aconfig-values-aosp-ap2a-com.android.server.display.feature.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.server.notification-all",
+        "aconfig-values-aosp-ap2a-com.android.server.companion.virtual-all",
+        "aconfig-values-aosp-ap2a-android.app-all",
+        "aconfig-values-aosp-ap2a-com.android.aconfig.test-all",
+        "aconfig-values-aosp-ap2a-com.android.internal.camera.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.internal.telephony.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.media.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.input.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.window.flags-all",
+        "aconfig-values-aosp-ap2a-android.credentials.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.graphics.surfaceflinger.flags-all",
+        "aconfig-values-aosp-ap2a-android.view.contentprotection.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.bluetooth.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.server.job-all",
+        "aconfig-values-aosp-ap2a-com.android.settings.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.server.accessibility-all",
+        "aconfig-values-aosp-ap2a-com.google.android.iwlan.flags-all",
+        "aconfig-values-aosp-ap2a-android.chre.flags-all",
+        "aconfig-values-aosp-ap2a-com.android.launcher3-all",
+        "aconfig-values-aosp-ap2a-com.example.android.aconfig.demo.flags-all",
+    ],
+}
diff --git a/aconfig/ap2a/android.app/Android.bp b/aconfig/ap2a/android.app/Android.bp
new file mode 100644
index 0000000..b707a5d
--- /dev/null
+++ b/aconfig/ap2a/android.app/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-aosp-ap2a-android.app-all",
+    package: "android.app",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/android.app/pinner_service_client_api_flag_values.textproto b/aconfig/ap2a/android.app/pinner_service_client_api_flag_values.textproto
new file mode 100644
index 0000000..6a0360b
--- /dev/null
+++ b/aconfig/ap2a/android.app/pinner_service_client_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "pinner_service_client_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/android.chre.flags/Android.bp b/aconfig/ap2a/android.chre.flags/Android.bp
new file mode 100644
index 0000000..f7cdb82
--- /dev/null
+++ b/aconfig/ap2a/android.chre.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-aosp-ap2a-android.chre.flags-all",
+    package: "android.chre.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto b/aconfig/ap2a/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
new file mode 100644
index 0000000..0fccef1
--- /dev/null
+++ b/aconfig/ap2a/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "flag_log_nanoapp_load_metrics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto b/aconfig/ap2a/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
new file mode 100644
index 0000000..feefe54
--- /dev/null
+++ b/aconfig/ap2a/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "metrics_reporter_in_the_daemon"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/android.credentials.flags/Android.bp b/aconfig/ap2a/android.credentials.flags/Android.bp
new file mode 100644
index 0000000..7d61331
--- /dev/null
+++ b/aconfig/ap2a/android.credentials.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-aosp-ap2a-android.credentials.flags-all",
+    package: "android.credentials.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/android.credentials.flags/instant_apps_enabled_flag_values.textproto b/aconfig/ap2a/android.credentials.flags/instant_apps_enabled_flag_values.textproto
new file mode 100644
index 0000000..f49b565
--- /dev/null
+++ b/aconfig/ap2a/android.credentials.flags/instant_apps_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "instant_apps_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/android.credentials.flags/new_settings_intents_flag_values.textproto b/aconfig/ap2a/android.credentials.flags/new_settings_intents_flag_values.textproto
new file mode 100644
index 0000000..76e7c50
--- /dev/null
+++ b/aconfig/ap2a/android.credentials.flags/new_settings_intents_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "new_settings_intents"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/android.view.contentprotection.flags/Android.bp b/aconfig/ap2a/android.view.contentprotection.flags/Android.bp
new file mode 100644
index 0000000..3991a61
--- /dev/null
+++ b/aconfig/ap2a/android.view.contentprotection.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-aosp-ap2a-android.view.contentprotection.flags-all",
+    package: "android.view.contentprotection.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto b/aconfig/ap2a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
new file mode 100644
index 0000000..62895e0
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto b/aconfig/ap2a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
new file mode 100644
index 0000000..4db8f5f
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto b/aconfig/ap2a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
new file mode 100644
index 0000000..e855d79
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/com.android.aconfig.test/Android.bp b/aconfig/ap2a/com.android.aconfig.test/Android.bp
new file mode 100644
index 0000000..5479600
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/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-aosp-ap2a-com.android.aconfig.test-all",
+    package: "com.android.aconfig.test",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto b/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
new file mode 100644
index 0000000..1ff36d0
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_fixed_ro_exported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto b/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
new file mode 100644
index 0000000..342cf85
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_fixed_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto b/aconfig/ap2a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
new file mode 100644
index 0000000..409b459
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_ro_exported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.aconfig.test/enabled_ro_flag_values.textproto b/aconfig/ap2a/com.android.aconfig.test/enabled_ro_flag_values.textproto
new file mode 100644
index 0000000..139a636
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/enabled_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.aconfig.test/enabled_rw_flag_values.textproto b/aconfig/ap2a/com.android.aconfig.test/enabled_rw_flag_values.textproto
new file mode 100644
index 0000000..22adf04
--- /dev/null
+++ b/aconfig/ap2a/com.android.aconfig.test/enabled_rw_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_rw"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/ap2a/com.android.bluetooth.flags/Android.bp b/aconfig/ap2a/com.android.bluetooth.flags/Android.bp
new file mode 100644
index 0000000..b1b77ef
--- /dev/null
+++ b/aconfig/ap2a/com.android.bluetooth.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-aosp-ap2a-com.android.bluetooth.flags-all",
+    package: "com.android.bluetooth.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.bluetooth.flags/use_new_satellite_mode_flag_values.textproto b/aconfig/ap2a/com.android.bluetooth.flags/use_new_satellite_mode_flag_values.textproto
new file mode 100644
index 0000000..a1f4d6d
--- /dev/null
+++ b/aconfig/ap2a/com.android.bluetooth.flags/use_new_satellite_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "use_new_satellite_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp
new file mode 100644
index 0000000..6234f14
--- /dev/null
+++ b/aconfig/ap2a/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-aosp-ap2a-com.android.graphics.surfaceflinger.flags-all",
+    package: "com.android.graphics.surfaceflinger.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
new file mode 100644
index 0000000..b79d222
--- /dev/null
+++ b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "connected_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
new file mode 100644
index 0000000..84371a8
--- /dev/null
+++ b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "enable_small_area_detection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
new file mode 100644
index 0000000..c4b2878
--- /dev/null
+++ b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "vrr_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.input.flags/Android.bp b/aconfig/ap2a/com.android.input.flags/Android.bp
new file mode 100644
index 0000000..92536c0
--- /dev/null
+++ b/aconfig/ap2a/com.android.input.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-aosp-ap2a-com.android.input.flags-all",
+    package: "com.android.input.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto b/aconfig/ap2a/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
new file mode 100644
index 0000000..a517714
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/com.android.internal.camera.flags/Android.bp b/aconfig/ap2a/com.android.internal.camera.flags/Android.bp
new file mode 100644
index 0000000..ae67f2d
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.camera.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-aosp-ap2a-com.android.internal.camera.flags-all",
+    package: "com.android.internal.camera.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto b/aconfig/ap2a/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
new file mode 100644
index 0000000..2b15442
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "log_ultrawide_usage"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto b/aconfig/ap2a/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
new file mode 100644
index 0000000..ca4a9c8
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "log_zoom_override_usage"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/Android.bp b/aconfig/ap2a/com.android.internal.telephony.flags/Android.bp
new file mode 100644
index 0000000..9b2513f
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.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-aosp-ap2a-com.android.internal.telephony.flags-all",
+    package: "com.android.internal.telephony.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
new file mode 100644
index 0000000..8e2deed
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "do_not_override_precise_label"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto
new file mode 100644
index 0000000..d180621
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_carrier_config_n1_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
new file mode 100644
index 0000000..6da4289
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
new file mode 100644
index 0000000..e4e387f
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "log_mms_sms_database_access_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/network_validation_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/network_validation_flag_values.textproto
new file mode 100644
index 0000000..ddd7058
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/network_validation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "network_validation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/reject_bad_sub_id_interaction_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/reject_bad_sub_id_interaction_flag_values.textproto
new file mode 100644
index 0000000..dcb5c06
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
new file mode 100644
index 0000000..428461c
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "relax_ho_teardown"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
new file mode 100644
index 0000000..04ac1d7
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "reorganize_roaming_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
new file mode 100644
index 0000000..da5401d
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "sms_domain_selection_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
new file mode 100644
index 0000000..0fe31c8
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "unthrottle_check_transport"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto b/aconfig/ap2a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
new file mode 100644
index 0000000..ed9c23e
--- /dev/null
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "update_ims_service_by_gathering_provisioning_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.launcher3/Android.bp b/aconfig/ap2a/com.android.launcher3/Android.bp
new file mode 100644
index 0000000..f0437f3
--- /dev/null
+++ b/aconfig/ap2a/com.android.launcher3/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-aosp-ap2a-com.android.launcher3-all",
+    package: "com.android.launcher3",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto b/aconfig/ap2a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
new file mode 100644
index 0000000..3f84cf3
--- /dev/null
+++ b/aconfig/ap2a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_cursor_hover_states"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.media.flags/Android.bp b/aconfig/ap2a/com.android.media.flags/Android.bp
new file mode 100644
index 0000000..931bb64
--- /dev/null
+++ b/aconfig/ap2a/com.android.media.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-aosp-ap2a-com.android.media.flags-all",
+    package: "com.android.media.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto b/aconfig/ap2a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
new file mode 100644
index 0000000..74ea00f
--- /dev/null
+++ b/aconfig/ap2a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "adjust_volume_for_foreground_app_playing_audio_without_media_session"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto b/aconfig/ap2a/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/ap2a/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/ap2a/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto b/aconfig/ap2a/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/ap2a/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/ap2a/com.android.server.accessibility/Android.bp b/aconfig/ap2a/com.android.server.accessibility/Android.bp
new file mode 100644
index 0000000..9132401
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.accessibility/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-aosp-ap2a-com.android.server.accessibility-all",
+    package: "com.android.server.accessibility",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto b/aconfig/ap2a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
new file mode 100644
index 0000000..c9fb087
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "scan_packages_without_lock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.companion.virtual/Android.bp b/aconfig/ap2a/com.android.server.companion.virtual/Android.bp
new file mode 100644
index 0000000..0cb0680
--- /dev/null
+++ b/aconfig/ap2a/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-aosp-ap2a-com.android.server.companion.virtual-all",
+    package: "com.android.server.companion.virtual",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.server.companion.virtual/dump_history_flag_values.textproto b/aconfig/ap2a/com.android.server.companion.virtual/dump_history_flag_values.textproto
new file mode 100644
index 0000000..ddcb135
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.companion.virtual/dump_history_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.companion.virtual"
+  name: "dump_history"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/Android.bp b/aconfig/ap2a/com.android.server.display.feature.flags/Android.bp
new file mode 100644
index 0000000..c33f0be
--- /dev/null
+++ b/aconfig/ap2a/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-aosp-ap2a-com.android.server.display.feature.flags-all",
+    package: "com.android.server.display.feature.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
new file mode 100644
index 0000000..6255d9a
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_adaptive_tone_improvements_1"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
new file mode 100644
index 0000000..f98b233
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_adaptive_tone_improvements_2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
new file mode 100644
index 0000000..34e7d70
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_connected_display_error_handling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
new file mode 100644
index 0000000..6d4df8e
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_connected_display_management"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
new file mode 100644
index 0000000..02c31b8
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_display_offload"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
new file mode 100644
index 0000000..b7d18ae
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_hdr_clamper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
new file mode 100644
index 0000000..a2891e0
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
@@ -0,0 +1,6 @@
+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/ap2a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
new file mode 100644
index 0000000..a3f4e47
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_nbm_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto b/aconfig/ap2a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
similarity index 100%
rename from aconfig/ap3a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
rename to aconfig/ap2a/com.android.server.display.feature.flags/enable_power_throttling_clamper_flag_values.textproto
diff --git a/aconfig/ap2a/com.android.server.job/Android.bp b/aconfig/ap2a/com.android.server.job/Android.bp
new file mode 100644
index 0000000..b6eca21
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.job/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-aosp-ap2a-com.android.server.job-all",
+    package: "com.android.server.job",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto b/aconfig/ap2a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
new file mode 100644
index 0000000..590fd53
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "relax_prefetch_connectivity_constraint_only_on_charger"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.server.notification/Android.bp b/aconfig/ap2a/com.android.server.notification/Android.bp
new file mode 100644
index 0000000..df045c4
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.notification/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-aosp-ap2a-com.android.server.notification-all",
+    package: "com.android.server.notification",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.server.notification/expire_bitmaps_flag_values.textproto b/aconfig/ap2a/com.android.server.notification/expire_bitmaps_flag_values.textproto
new file mode 100644
index 0000000..6fb6f65
--- /dev/null
+++ b/aconfig/ap2a/com.android.server.notification/expire_bitmaps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "expire_bitmaps"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.settings.flags/Android.bp b/aconfig/ap2a/com.android.settings.flags/Android.bp
new file mode 100644
index 0000000..2326d81
--- /dev/null
+++ b/aconfig/ap2a/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-aosp-ap2a-com.android.settings.flags-all",
+    package: "com.android.settings.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto b/aconfig/ap2a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
new file mode 100644
index 0000000..b6ad626
--- /dev/null
+++ b/aconfig/ap2a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "dedupe_dnd_settings_channels"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto b/aconfig/ap2a/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
new file mode 100644
index 0000000..19c747b
--- /dev/null
+++ b/aconfig/ap2a/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_subsequent_pair_settings_integration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto b/aconfig/ap2a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
new file mode 100644
index 0000000..9239762
--- /dev/null
+++ b/aconfig/ap2a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "mainline_module_explicit_intent"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto b/aconfig/ap2a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
new file mode 100644
index 0000000..b0f22cd
--- /dev/null
+++ b/aconfig/ap2a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "show_factory_reset_cancel_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.window.flags/Android.bp b/aconfig/ap2a/com.android.window.flags/Android.bp
new file mode 100644
index 0000000..ebd16c9
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.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-aosp-ap2a-com.android.window.flags-all",
+    package: "com.android.window.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
new file mode 100644
index 0000000..731e912
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "allow_disable_activity_record_input_sink"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
new file mode 100644
index 0000000..5901751
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "allows_screen_size_decoupled_from_status_bar_and_cutout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.window.flags/delete_capture_display_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/delete_capture_display_flag_values.textproto
new file mode 100644
index 0000000..0ba4ddd
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.flags/delete_capture_display_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "delete_capture_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto
similarity index 100%
rename from aconfig/trunk_staging/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto
rename to aconfig/ap2a/com.android.window.flags/introduce_smoother_dimmer_flag_values.textproto
diff --git a/aconfig/ap2a/com.android.window.flags/secure_window_state_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/secure_window_state_flag_values.textproto
new file mode 100644
index 0000000..a486c16
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.flags/secure_window_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "secure_window_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
new file mode 100644
index 0000000..dff3478
--- /dev/null
+++ b/aconfig/ap2a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "surface_trusted_overlay"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto b/aconfig/ap2a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
new file mode 100644
index 0000000..8736ae3
--- /dev/null
+++ b/aconfig/ap2a/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/ap2a/com.example.android.aconfig.demo.flags/Android.bp b/aconfig/ap2a/com.example.android.aconfig.demo.flags/Android.bp
new file mode 100644
index 0000000..31e19be
--- /dev/null
+++ b/aconfig/ap2a/com.example.android.aconfig.demo.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-aosp-ap2a-com.example.android.aconfig.demo.flags-all",
+    package: "com.example.android.aconfig.demo.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto b/aconfig/ap2a/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto
new file mode 100644
index 0000000..72cb327
--- /dev/null
+++ b/aconfig/ap2a/com.example.android.aconfig.demo.flags/test_flag_gantry_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.example.android.aconfig.demo.flags"
+  name: "test_flag_gantry"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp b/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp
new file mode 100644
index 0000000..4a80bcb
--- /dev/null
+++ b/aconfig/ap2a/com.google.android.iwlan.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-aosp-ap2a-com.google.android.iwlan.flags-all",
+    package: "com.google.android.iwlan.flags",
+    srcs: [
+        "*_flag_values.textproto",
+    ],
+}
diff --git a/aconfig/ap2a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto b/aconfig/ap2a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
new file mode 100644
index 0000000..fd95116
--- /dev/null
+++ b/aconfig/ap2a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "prevent_epdg_selection_threads_exhausted"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/Android.bp b/aconfig/ap3a/Android.bp
index d13b909..27464c2 100644
--- a/aconfig/ap3a/Android.bp
+++ b/aconfig/ap3a/Android.bp
@@ -15,153 +15,153 @@
 aconfig_value_set {
     name: "aconfig_value_set-platform_build_release-ap3a",
     values: [
-      "aconfig-values-platform_build_release-ap3a-android.app.usage-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.companion.virtualdevice.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.service.voice.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.service.notification-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.power.batterysaver-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.stats-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.job-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.libcore-all",
+      "aconfig-values-platform_build_release-ap3a-android.graphics.pdf.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.wearable-all",
+      "aconfig-values-platform_build_release-ap3a-android.os.profiling-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.telecom.flags-all",
       "aconfig-values-platform_build_release-ap3a-com.android.launcher3-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.net.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.power.optimization-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.appsearch.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.sdksandbox.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.hardware.biometrics-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.providers.media.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.systemui.car-all",
       "aconfig-values-platform_build_release-ap3a-com.android.adservices.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.libhardware.dynamic.sensors.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.security.flag-all",
       "aconfig-values-platform_build_release-ap3a-android.net.wifi.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.hardware.devicestate.feature.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.content.pm-all",
+      "aconfig-values-platform_build_release-ap3a-android.credentials.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.admin.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.policy-all",
+      "aconfig-values-platform_build_release-ap3a-com.google.android.iwlan.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.power.feature.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.graphics.libgui.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.feature.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.power.hint-all",
+      "aconfig-values-platform_build_release-ap3a-android.view.contentcapture.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.hardware.biometrics-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.appsearch.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settings.media_drm-all",
+      "aconfig-values-platform_build_release-ap3a-android.security-all",
+      "aconfig-values-platform_build_release-ap3a-android.provider-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.audio-all",
+      "aconfig-values-platform_build_release-ap3a-android.view.inputmethod-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.hardware.libsensor.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.ondeviceintelligence.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.adaptiveauth-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.frameworks.sensorservice.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settings.factory_reset-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.companion.virtual-all",
+      "aconfig-values-platform_build_release-ap3a-android.speech.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.power.optimization-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.net-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.playback.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.appwidget.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settings.accessibility-all",
+      "aconfig-values-platform_build_release-ap3a-android.content.res-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.editing.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.bluetooth.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.widget.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.widget.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.view.contentprotection.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.net.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.service.controls.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.systemui.accessibility.accessibilitymenu-all",
+      "aconfig-values-platform_build_release-ap3a-android.os-all",
       "aconfig-values-platform_build_release-ap3a-android.os.vibrator-all",
       "aconfig-values-platform_build_release-ap3a-com.android.graphics.hwui.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.intentresolver-all",
-      "aconfig-values-platform_build_release-ap3a-android.server-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.am-all",
-      "aconfig-values-platform_build_release-ap3a-android.provider-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.uwb.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.power.hint-all",
-      "aconfig-values-platform_build_release-ap3a-android.database.sqlite-all",
-      "aconfig-values-platform_build_release-ap3a-android.view.contentcapture.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.power.batterysaver-all",
-      "aconfig-values-platform_build_release-ap3a-android.service.notification-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.accessibility-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.companion.virtual-all",
-      "aconfig-values-platform_build_release-ap3a-android.hardware.radio-all",
-      "aconfig-values-platform_build_release-ap3a-android.view.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.flags-all",
       "aconfig-values-platform_build_release-ap3a-android.webkit-all",
-      "aconfig-values-platform_build_release-ap3a-android.view.accessibility-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.os-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.widget.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.credentials.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.egg.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.mainline.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.net.platform.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.deviceaswebcam.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.flags-all",
       "aconfig-values-platform_build_release-ap3a-android.service.chooser-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.widget.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.frameworks.sensorservice.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.libcore-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.usb.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.os.profiling-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.camera.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.policy.feature.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.compat.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.foldables.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.pm.pkg.component.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.adservices.ondevicepersonalization.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.companion.virtual.flags-all",
+      "aconfig-values-platform_build_release-ap3a-vendor.vibrator.hal.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.service.autofill-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.mainline.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.hardware.input-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.car.carlauncher-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.aconfig.test-all",
+      "aconfig-values-platform_build_release-ap3a-android.companion-all",
       "aconfig-values-platform_build_release-ap3a-android.multiuser-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settings.factory_reset-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.providers.contactkeys.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.media.audio-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.telephony.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.database.sqlite-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.healthconnect.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.icu-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.systemui.car-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.performance.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.backup-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.accessibility-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.notification-all",
+      "aconfig-values-platform_build_release-ap3a-android.nfc-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.system.virtualmachine.flags-all",
       "aconfig-values-platform_build_release-ap3a-android.permission.flags-all",
       "aconfig-values-platform_build_release-ap3a-com.android.graphics.surfaceflinger.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.libhardware.dynamic.sensors.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.smartspace.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.job-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.dreams-all",
-      "aconfig-values-platform_build_release-ap3a-android.hardware.devicestate.feature.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.input.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.content.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.telecom.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settings.accessibility-all",
-      "aconfig-values-platform_build_release-ap3a-android.media.codec-all",
-      "aconfig-values-platform_build_release-ap3a-android.view.inputmethod-all",
-      "aconfig-values-platform_build_release-ap3a-android.service.autofill-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.systemui-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.telephony.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.service.dreams-all",
-      "aconfig-values-platform_build_release-ap3a-vendor.vibrator.hal.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.codec.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.bluetooth.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.companion.virtualdevice.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.graphics.libgui.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.adservices.ondevicepersonalization.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.power.feature.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.hardware.input-all",
-      "aconfig-values-platform_build_release-ap3a-android.hardware.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.location.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.providers.contactkeys.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.media.audiopolicy-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.ondeviceintelligence.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.chre.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.window.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.icu-all",
-      "aconfig-values-platform_build_release-ap3a-android.view.contentprotection.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.content.res-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.system.virtualmachine.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.btaudio.hal.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.media.midi-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.foldables.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.permission.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.editing.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.media.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.car.dockutil-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.wearable-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.camera.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.car.feature-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.contextualsearch.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.net.vcn-all",
-      "aconfig-values-platform_build_release-ap3a-android.service.controls.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.pm.pkg.component.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.nfc-all",
-      "aconfig-values-platform_build_release-ap3a-android.server.app-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.healthconnect.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.hardware.usb.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.graphics.pdf.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.crashrecovery.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.job-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.hardware.libsensor.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.app.admin.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.display.feature.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.notification-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.feature.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.systemui.shared-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.performance.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.playback.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.speech.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.companion-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.stats-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.systemui.accessibility.accessibilitymenu-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.internal.compat.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.wifi.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.audio-all",
-      "aconfig-values-platform_build_release-ap3a-android.security.flag-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.audioserver-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.ipsec.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.policy-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settings.media_drm-all",
-      "aconfig-values-platform_build_release-ap3a-android.app-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.nfc.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.car.carlauncher-all",
-      "aconfig-values-platform_build_release-ap3a-android.service.voice.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.appwidget.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.security-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.text.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.aconfig.test-all",
-      "aconfig-values-platform_build_release-ap3a-com.google.android.iwlan.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.adaptiveauth-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.media.aaudio-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.net.thread.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.companion.virtual.flags-all",
       "aconfig-values-platform_build_release-ap3a-com.android.wm.shell-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.backup-all",
-      "aconfig-values-platform_build_release-ap3a-android.content.pm-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.policy.feature.flags-all",
-      "aconfig-values-platform_build_release-ap3a-android.os-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.nearby.flags-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.usage-all",
+      "aconfig-values-platform_build_release-ap3a-android.location.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.service.dreams-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.sdksandbox.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.audioserver-all",
+      "aconfig-values-platform_build_release-ap3a-android.view.accessibility-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.usb.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.intentresolver-all",
+      "aconfig-values-platform_build_release-ap3a-android.view.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.server-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.codec.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.server.app-all",
+      "aconfig-values-platform_build_release-ap3a-android.net.vcn-all",
+      "aconfig-values-platform_build_release-ap3a-android.chre.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.deviceaswebcam.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.job-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.smartspace.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.egg.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.net.platform.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.media.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.uwb.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.hardware.usb.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.nfc.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.net.thread.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.systemui-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.internal.os-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.am-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.permission.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.media.codec-all",
+      "aconfig-values-platform_build_release-ap3a-android.media.midi-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.text.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.window.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.providers.media.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.media.audiopolicy-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.settingslib.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.systemui.shared-all",
+      "aconfig-values-platform_build_release-ap3a-android.hardware.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.btaudio.hal.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.ipsec.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.server.dreams-all",
       "aconfig-values-platform_build_release-ap3a-com.android.providers.settings-all",
-      "aconfig-values-platform_build_release-ap3a-android.media.audio-all",
-      "aconfig-values-platform_build_release-ap3a-com.android.server.net-all"
+      "aconfig-values-platform_build_release-ap3a-com.android.car.dockutil-all",
+      "aconfig-values-platform_build_release-ap3a-android.hardware.radio-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.nearby.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.app.contextualsearch.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.content.flags-all",
+      "aconfig-values-platform_build_release-ap3a-android.car.feature-all",
+      "aconfig-values-platform_build_release-ap3a-android.crashrecovery.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.wifi.flags-all",
+      "aconfig-values-platform_build_release-ap3a-com.android.media.aaudio-all"
     ]
 }
diff --git a/aconfig/ap3a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto b/aconfig/ap3a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
new file mode 100644
index 0000000..3e1e4a7
--- /dev/null
+++ b/aconfig/ap3a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.devicestate.feature.flags"
+  name: "device_state_requester_cancel_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
\ No newline at end of file
diff --git a/aconfig/ap3a/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto b/aconfig/ap3a/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto
deleted file mode 100644
index 934f017..0000000
--- a/aconfig/ap3a/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_call_stop_before_set_position_mode"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto
new file mode 100644
index 0000000..7fbfd3d
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/delay_bonding_when_busy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "delay_bonding_when_busy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto
new file mode 100644
index 0000000..3617ee0
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/dumpsys_use_passed_in_fd_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "dumpsys_use_passed_in_fd"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto
new file mode 100644
index 0000000..33f2991
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/le_audio_fast_bond_params_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_audio_fast_bond_params"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto
new file mode 100644
index 0000000..b8057b2
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/le_scan_parameters_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_scan_parameters_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto
new file mode 100644
index 0000000..85f9aa0
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/report_vsc_data_from_the_gd_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "report_vsc_data_from_the_gd_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto b/aconfig/ap3a/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto
new file mode 100644
index 0000000..b440e9d
--- /dev/null
+++ b/aconfig/ap3a/com.android.bluetooth.flags/rnr_cancel_before_event_race_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "rnr_cancel_before_event_race"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto b/aconfig/ap3a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
new file mode 100644
index 0000000..ce7c199
--- /dev/null
+++ b/aconfig/ap3a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_device_diagnostics_in_settings"
+  state: DISABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto b/aconfig/ap3a/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
new file mode 100644
index 0000000..f609e07
--- /dev/null
+++ b/aconfig/ap3a/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "hide_le_audio_toggle_for_le_audio_only_device"
+  state: DISABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto b/aconfig/ap3a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
index e4bb494..07ed21b 100644
--- a/aconfig/ap3a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
+++ b/aconfig/ap3a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
@@ -1,6 +1,6 @@
 flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_determining_spatial_audio_attributes_by_profile"
-  state: ENABLED
-  permission: READ_ONLY
+    package: "com.android.settingslib.flags"
+    name: "enable_determining_spatial_audio_attributes_by_profile"
+    state: ENABLED
+    permission: READ_ONLY
 }
diff --git a/aconfig/ap3a/com.android.window.flags/ensure_wallpaper_in_transitions.textproto b/aconfig/ap3a/com.android.window.flags/ensure_wallpaper_in_transitions.textproto
new file mode 100644
index 0000000..d50af61
--- /dev/null
+++ b/aconfig/ap3a/com.android.window.flags/ensure_wallpaper_in_transitions.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "ensure_wallpaper_in_transitions"
+  state: ENABLED
+  permission: READ_ONLY
+}
\ No newline at end of file
diff --git a/aconfig/ap4a/Android.bp b/aconfig/ap4a/Android.bp
new file mode 100644
index 0000000..c0f1713
--- /dev/null
+++ b/aconfig/ap4a/Android.bp
@@ -0,0 +1,175 @@
+// 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-platform_build_release-ap4a",
+    values: [
+      "aconfig-values-platform_build_release-ap4a-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.systemui.accessibility.accessibilitymenu-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.notification-all",
+      "aconfig-values-platform_build_release-ap4a-android.companion-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.providers.settings-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.btaudio.hal.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.powerstats-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.uwb.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.biometrics-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.pm.pkg.component.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.net.wifi.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.providers.media.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.adservices.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.stats-all",
+      "aconfig-values-platform_build_release-ap4a-android.content.pm-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.policy-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.power.batterysaver-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.systemui-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.playback.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.intentresolver-all",
+      "aconfig-values-platform_build_release-ap4a-android.provider-all",
+      "aconfig-values-platform_build_release-ap4a-android.multiuser-all",
+      "aconfig-values-platform_build_release-ap4a-android.hardware.devicestate.feature.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.backup-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.deviceidle-all",
+      "aconfig-values-platform_build_release-ap4a-android.database.sqlite-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.audio-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.contextualsearch.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.performance.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.notification-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.net-all",
+      "aconfig-values-platform_build_release-ap4a-android.permission.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.view.inputmethod-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.telephony.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.net.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.foldables.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.net.platform.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.webkit-all",
+      "aconfig-values-platform_build_release-ap4a-android.hardware.usb.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settingslib.widget.selectorwithwidgetpreference.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.view.contentcapture.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.voice.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.dreams-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.launcher3-all",
+      "aconfig-values-platform_build_release-ap4a-android.crashrecovery.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.power.hint-all",
+      "aconfig-values-platform_build_release-ap4a-android.security.flag-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.job-all",
+      "aconfig-values-platform_build_release-ap4a-android.app-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.permission.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.feature.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settings.accessibility-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.aconfig.test-all",
+      "aconfig-values-platform_build_release-ap4a-android.view.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.security-all",
+      "aconfig-values-platform_build_release-ap4a-android.hardware.biometrics-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.power.feature.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.audioserver-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.car.carlauncher-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.autofill-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settingslib.widget.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.bluetooth.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settings.development-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settings.media_drm-all",
+      "aconfig-values-platform_build_release-ap4a-android.location.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.policy.feature.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.wm.shell-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.controls.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.accessibility-all",
+      "aconfig-values-platform_build_release-ap4a-vendor.vibrator.hal.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.hardware.libsensor.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.nfc-all",
+      "aconfig-values-platform_build_release-ap4a-android.speech.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.codec.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.os-all",
+      "aconfig-values-platform_build_release-ap4a-android.service.chooser-all",
+      "aconfig-values-platform_build_release-ap4a-android.widget.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.media.midi-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settings.factory_reset-all",
+      "aconfig-values-platform_build_release-ap4a-android.companion.virtualdevice.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.usb.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.os.profiling-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.hardware.input-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.wearable-all",
+      "aconfig-values-platform_build_release-ap4a-android.media.codec-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.providers.contactkeys.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.content.res-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.dreams-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.systemui.shared-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.wifi.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.smartspace.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.car.datasubscription-all",
+      "aconfig-values-platform_build_release-ap4a-android.graphics.pdf.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.sdksandbox.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.systemui.car-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.nearby.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.deviceaswebcam.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.window.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.job-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.editing.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.ipsec.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.icu-all",
+      "aconfig-values-platform_build_release-ap4a-android.content.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.view.accessibility-all",
+      "aconfig-values-platform_build_release-ap4a-android.hardware.radio-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.deviceconfig-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.compat.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.aaudio-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.usage-all",
+      "aconfig-values-platform_build_release-ap4a-android.credentials.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.ondeviceintelligence.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settingslib.media.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.system.virtualmachine.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.appsearch.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.app.admin.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.car.settings-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.graphics.libgui.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.car.feature-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.camera.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.usage-all",
+      "aconfig-values-platform_build_release-ap4a-android.companion.virtual.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.os.vibrator-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.power.optimization-all",
+      "aconfig-values-platform_build_release-ap4a-android.hardware.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.media.audiopolicy-all",
+      "aconfig-values-platform_build_release-ap4a-android.net.vcn-all",
+      "aconfig-values-platform_build_release-ap4a-android.view.contentprotection.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.media.mainline.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.settingslib.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.net.thread.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.am-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.healthconnect.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.media.audio-all",
+      "aconfig-values-platform_build_release-ap4a-android.adaptiveauth-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.graphics.surfaceflinger.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.server.app-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.adservices.ondevicepersonalization.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.car.dockutil-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.internal.os-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.text.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.nfc.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.chre.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.frameworks.sensorservice.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.libcore-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.graphics.hwui.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.google.android.iwlan.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.libhardware.dynamic.sensors.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.server-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.server.telecom.flags-all",
+      "aconfig-values-platform_build_release-ap4a-android.appwidget.flags-all",
+      "aconfig-values-platform_build_release-ap4a-com.android.egg.flags-all"
+    ]
+}
diff --git a/aconfig/ap4a/android.adaptiveauth/Android.bp b/aconfig/ap4a/android.adaptiveauth/Android.bp
new file mode 100644
index 0000000..ef1a262
--- /dev/null
+++ b/aconfig/ap4a/android.adaptiveauth/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-platform_build_release-ap4a-android.adaptiveauth-all",
+  package: "android.adaptiveauth",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto b/aconfig/ap4a/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto
new file mode 100644
index 0000000..5cdd229
--- /dev/null
+++ b/aconfig/ap4a/android.adaptiveauth/enable_adaptive_auth_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.adaptiveauth"
+  name: "enable_adaptive_auth"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto b/aconfig/ap4a/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto
new file mode 100644
index 0000000..2366bf8
--- /dev/null
+++ b/aconfig/ap4a/android.adaptiveauth/report_biometric_auth_attempts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.adaptiveauth"
+  name: "report_biometric_auth_attempts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/Android.bp b/aconfig/ap4a/android.app.admin.flags/Android.bp
new file mode 100644
index 0000000..fa168c9
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.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-platform_build_release-ap4a-android.app.admin.flags-all",
+  package: "android.app.admin.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto
new file mode 100644
index 0000000..e62aa73
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/allow_querying_profile_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "allow_querying_profile_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto
new file mode 100644
index 0000000..5c88e77
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/assist_content_user_restriction_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "assist_content_user_restriction_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto
new file mode 100644
index 0000000..6061d7b
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/backup_service_security_log_event_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "backup_service_security_log_event_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..b6f7c75
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/dedicated_device_control_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "dedicated_device_control_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto
new file mode 100644
index 0000000..8df22c6
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/default_sms_personal_app_suspension_fix_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "default_sms_personal_app_suspension_fix_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto
new file mode 100644
index 0000000..bd94962
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/device_policy_size_tracking_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "device_policy_size_tracking_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto
new file mode 100644
index 0000000..f26d50d
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/disallow_user_control_stopped_state_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "disallow_user_control_stopped_state_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
new file mode 100644
index 0000000..9d7085e
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "dont_read_policy_definition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/esim_management_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/esim_management_enabled_flag_values.textproto
new file mode 100644
index 0000000..b45aca1
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/esim_management_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "esim_management_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto
new file mode 100644
index 0000000..a433a2b
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/headless_device_owner_single_user_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "headless_device_owner_single_user_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto
new file mode 100644
index 0000000..d70aa3e
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/is_mte_policy_enforced_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "is_mte_policy_enforced"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
new file mode 100644
index 0000000..3bfce62
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "management_mode_policy_metrics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..9bd8d3f
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_storage_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "onboarding_bugreport_storage_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto
new file mode 100644
index 0000000..4fd631d
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/onboarding_bugreport_v2_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "onboarding_bugreport_v2_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto
new file mode 100644
index 0000000..7267f96
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/onboarding_consentless_bugreports_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "onboarding_consentless_bugreports"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..1b985bf
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/permission_migration_for_zero_trust_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "permission_migration_for_zero_trust_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto
new file mode 100644
index 0000000..2cba9cf
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/policy_engine_migration_v2_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "policy_engine_migration_v2_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
new file mode 100644
index 0000000..856f859
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "provisioning_context_parameter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..4f93246
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/quiet_mode_credential_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "quiet_mode_credential_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto b/aconfig/ap4a/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto
new file mode 100644
index 0000000..e040435
--- /dev/null
+++ b/aconfig/ap4a/android.app.admin.flags/security_log_v2_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "security_log_v2_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.contextualsearch.flags/Android.bp b/aconfig/ap4a/android.app.contextualsearch.flags/Android.bp
new file mode 100644
index 0000000..96c4841
--- /dev/null
+++ b/aconfig/ap4a/android.app.contextualsearch.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-platform_build_release-ap4a-android.app.contextualsearch.flags-all",
+  package: "android.app.contextualsearch.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.contextualsearch.flags/enable_service_flag_values.textproto b/aconfig/ap4a/android.app.contextualsearch.flags/enable_service_flag_values.textproto
new file mode 100644
index 0000000..ad0461a
--- /dev/null
+++ b/aconfig/ap4a/android.app.contextualsearch.flags/enable_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.contextualsearch.flags"
+  name: "enable_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.job/Android.bp b/aconfig/ap4a/android.app.job/Android.bp
new file mode 100644
index 0000000..c6be9bd
--- /dev/null
+++ b/aconfig/ap4a/android.app.job/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-platform_build_release-ap4a-android.app.job-all",
+  package: "android.app.job",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.job/job_debug_info_apis_flag_values.textproto b/aconfig/ap4a/android.app.job/job_debug_info_apis_flag_values.textproto
new file mode 100644
index 0000000..0462931
--- /dev/null
+++ b/aconfig/ap4a/android.app.job/job_debug_info_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.job"
+  name: "job_debug_info_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.ondeviceintelligence.flags/Android.bp b/aconfig/ap4a/android.app.ondeviceintelligence.flags/Android.bp
new file mode 100644
index 0000000..f61c8e4
--- /dev/null
+++ b/aconfig/ap4a/android.app.ondeviceintelligence.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-platform_build_release-ap4a-android.app.ondeviceintelligence.flags-all",
+  package: "android.app.ondeviceintelligence.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto b/aconfig/ap4a/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto
new file mode 100644
index 0000000..a40d9e4
--- /dev/null
+++ b/aconfig/ap4a/android.app.ondeviceintelligence.flags/enable_on_device_intelligence_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.ondeviceintelligence.flags"
+  name: "enable_on_device_intelligence"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.smartspace.flags/Android.bp b/aconfig/ap4a/android.app.smartspace.flags/Android.bp
new file mode 100644
index 0000000..2cb342c
--- /dev/null
+++ b/aconfig/ap4a/android.app.smartspace.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-platform_build_release-ap4a-android.app.smartspace.flags-all",
+  package: "android.app.smartspace.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.smartspace.flags/access_smartspace_flag_values.textproto b/aconfig/ap4a/android.app.smartspace.flags/access_smartspace_flag_values.textproto
new file mode 100644
index 0000000..588ad79
--- /dev/null
+++ b/aconfig/ap4a/android.app.smartspace.flags/access_smartspace_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.smartspace.flags"
+  name: "access_smartspace"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.smartspace.flags/remote_views_flag_values.textproto b/aconfig/ap4a/android.app.smartspace.flags/remote_views_flag_values.textproto
new file mode 100644
index 0000000..6219ab9
--- /dev/null
+++ b/aconfig/ap4a/android.app.smartspace.flags/remote_views_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.smartspace.flags"
+  name: "remote_views"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/Android.bp b/aconfig/ap4a/android.app.usage/Android.bp
new file mode 100644
index 0000000..b808378
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/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-platform_build_release-ap4a-android.app.usage-all",
+  package: "android.app.usage",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.usage/disable_idle_check_flag_values.textproto b/aconfig/ap4a/android.app.usage/disable_idle_check_flag_values.textproto
new file mode 100644
index 0000000..c7e92a5
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/disable_idle_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "disable_idle_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/filter_based_event_query_api_flag_values.textproto b/aconfig/ap4a/android.app.usage/filter_based_event_query_api_flag_values.textproto
new file mode 100644
index 0000000..dd510d6
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/filter_based_event_query_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "filter_based_event_query_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto b/aconfig/ap4a/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto
new file mode 100644
index 0000000..3d9a009
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/get_app_bytes_by_data_type_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "get_app_bytes_by_data_type_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/report_usage_stats_permission_flag_values.textproto b/aconfig/ap4a/android.app.usage/report_usage_stats_permission_flag_values.textproto
new file mode 100644
index 0000000..a962fcb
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/report_usage_stats_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "report_usage_stats_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/use_dedicated_handler_thread_flag_values.textproto b/aconfig/ap4a/android.app.usage/use_dedicated_handler_thread_flag_values.textproto
new file mode 100644
index 0000000..99a0b66
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/use_dedicated_handler_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "use_dedicated_handler_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/use_parceled_list_flag_values.textproto b/aconfig/ap4a/android.app.usage/use_parceled_list_flag_values.textproto
new file mode 100644
index 0000000..5de8913
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/use_parceled_list_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "use_parceled_list"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.usage/user_interaction_type_api_flag_values.textproto b/aconfig/ap4a/android.app.usage/user_interaction_type_api_flag_values.textproto
new file mode 100644
index 0000000..a4f27b2
--- /dev/null
+++ b/aconfig/ap4a/android.app.usage/user_interaction_type_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.usage"
+  name: "user_interaction_type_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.wearable/Android.bp b/aconfig/ap4a/android.app.wearable/Android.bp
new file mode 100644
index 0000000..aaa1d3a
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/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-platform_build_release-ap4a-android.app.wearable-all",
+  package: "android.app.wearable",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app.wearable/enable_data_request_observer_api_flag_values.textproto b/aconfig/ap4a/android.app.wearable/enable_data_request_observer_api_flag_values.textproto
new file mode 100644
index 0000000..7c0081e
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/enable_data_request_observer_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.wearable"
+  name: "enable_data_request_observer_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto b/aconfig/ap4a/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto
new file mode 100644
index 0000000..ebd5e03
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/enable_hotword_wearable_sensing_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.wearable"
+  name: "enable_hotword_wearable_sensing_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto b/aconfig/ap4a/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto
new file mode 100644
index 0000000..b85af36
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/enable_provide_wearable_connection_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.wearable"
+  name: "enable_provide_wearable_connection_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.wearable/enable_restart_wss_process_flag_values.textproto b/aconfig/ap4a/android.app.wearable/enable_restart_wss_process_flag_values.textproto
new file mode 100644
index 0000000..77e9e2e
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/enable_restart_wss_process_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.wearable"
+  name: "enable_restart_wss_process"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto b/aconfig/ap4a/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto
new file mode 100644
index 0000000..3af273c
--- /dev/null
+++ b/aconfig/ap4a/android.app.wearable/enable_unsupported_operation_status_code_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.wearable"
+  name: "enable_unsupported_operation_status_code"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/Android.bp b/aconfig/ap4a/android.app/Android.bp
new file mode 100644
index 0000000..6e02991
--- /dev/null
+++ b/aconfig/ap4a/android.app/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-platform_build_release-ap4a-android.app-all",
+  package: "android.app",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.app/api_tvextender_flag_values.textproto b/aconfig/ap4a/android.app/api_tvextender_flag_values.textproto
new file mode 100644
index 0000000..415716d
--- /dev/null
+++ b/aconfig/ap4a/android.app/api_tvextender_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "api_tvextender"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/app_restrictions_api_flag_values.textproto b/aconfig/ap4a/android.app/app_restrictions_api_flag_values.textproto
new file mode 100644
index 0000000..135904e
--- /dev/null
+++ b/aconfig/ap4a/android.app/app_restrictions_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "app_restrictions_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/app_start_info_flag_values.textproto b/aconfig/ap4a/android.app/app_start_info_flag_values.textproto
new file mode 100644
index 0000000..fe995d4
--- /dev/null
+++ b/aconfig/ap4a/android.app/app_start_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "app_start_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/app_start_info_timestamps_flag_values.textproto b/aconfig/ap4a/android.app/app_start_info_timestamps_flag_values.textproto
new file mode 100644
index 0000000..9f0b6e1
--- /dev/null
+++ b/aconfig/ap4a/android.app/app_start_info_timestamps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "app_start_info_timestamps"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/bic_client_flag_values.textproto b/aconfig/ap4a/android.app/bic_client_flag_values.textproto
new file mode 100644
index 0000000..c250c21
--- /dev/null
+++ b/aconfig/ap4a/android.app/bic_client_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "bic_client"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/cache_get_current_user_id_flag_values.textproto b/aconfig/ap4a/android.app/cache_get_current_user_id_flag_values.textproto
new file mode 100644
index 0000000..521b93d
--- /dev/null
+++ b/aconfig/ap4a/android.app/cache_get_current_user_id_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "cache_get_current_user_id"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/category_voicemail_flag_values.textproto b/aconfig/ap4a/android.app/category_voicemail_flag_values.textproto
new file mode 100644
index 0000000..c0a873d
--- /dev/null
+++ b/aconfig/ap4a/android.app/category_voicemail_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "category_voicemail"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/clean_up_spans_and_new_lines_flag_values.textproto b/aconfig/ap4a/android.app/clean_up_spans_and_new_lines_flag_values.textproto
new file mode 100644
index 0000000..eb3ec0c
--- /dev/null
+++ b/aconfig/ap4a/android.app/clean_up_spans_and_new_lines_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "clean_up_spans_and_new_lines"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto b/aconfig/ap4a/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto
new file mode 100644
index 0000000..8f8b03f
--- /dev/null
+++ b/aconfig/ap4a/android.app/clear_dns_cache_on_network_rules_update_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "clear_dns_cache_on_network_rules_update"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/compact_heads_up_notification_flag_values.textproto b/aconfig/ap4a/android.app/compact_heads_up_notification_flag_values.textproto
new file mode 100644
index 0000000..7fb926f
--- /dev/null
+++ b/aconfig/ap4a/android.app/compact_heads_up_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "compact_heads_up_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto b/aconfig/ap4a/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto
new file mode 100644
index 0000000..9e50d18
--- /dev/null
+++ b/aconfig/ap4a/android.app/enable_fgs_timeout_crash_behavior_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "enable_fgs_timeout_crash_behavior"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/enable_night_mode_binder_cache_flag_values.textproto b/aconfig/ap4a/android.app/enable_night_mode_binder_cache_flag_values.textproto
new file mode 100644
index 0000000..ac6f23c
--- /dev/null
+++ b/aconfig/ap4a/android.app/enable_night_mode_binder_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "enable_night_mode_binder_cache"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto b/aconfig/ap4a/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto
new file mode 100644
index 0000000..f410e55
--- /dev/null
+++ b/aconfig/ap4a/android.app/enable_pip_ui_state_callback_on_entering_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "enable_pip_ui_state_callback_on_entering"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/evenly_divided_call_style_action_layout_flag_values.textproto b/aconfig/ap4a/android.app/evenly_divided_call_style_action_layout_flag_values.textproto
new file mode 100644
index 0000000..3741ebd
--- /dev/null
+++ b/aconfig/ap4a/android.app/evenly_divided_call_style_action_layout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "evenly_divided_call_style_action_layout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/get_binding_uid_importance_flag_values.textproto b/aconfig/ap4a/android.app/get_binding_uid_importance_flag_values.textproto
new file mode 100644
index 0000000..2087485
--- /dev/null
+++ b/aconfig/ap4a/android.app/get_binding_uid_importance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "get_binding_uid_importance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto b/aconfig/ap4a/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto
new file mode 100644
index 0000000..c05e24b
--- /dev/null
+++ b/aconfig/ap4a/android.app/introduce_new_service_ontimeout_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "introduce_new_service_ontimeout_callback"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/keyguard_private_notifications_flag_values.textproto b/aconfig/ap4a/android.app/keyguard_private_notifications_flag_values.textproto
new file mode 100644
index 0000000..26bbc61
--- /dev/null
+++ b/aconfig/ap4a/android.app/keyguard_private_notifications_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "keyguard_private_notifications"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/modes_api_flag_values.textproto b/aconfig/ap4a/android.app/modes_api_flag_values.textproto
new file mode 100644
index 0000000..b85962c
--- /dev/null
+++ b/aconfig/ap4a/android.app/modes_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "modes_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/notif_channel_crop_vibration_effects_flag_values.textproto b/aconfig/ap4a/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
new file mode 100644
index 0000000..1843a5f
--- /dev/null
+++ b/aconfig/ap4a/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "notif_channel_crop_vibration_effects"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/notification_channel_vibration_effect_api_flag_values.textproto b/aconfig/ap4a/android.app/notification_channel_vibration_effect_api_flag_values.textproto
new file mode 100644
index 0000000..dbdc382
--- /dev/null
+++ b/aconfig/ap4a/android.app/notification_channel_vibration_effect_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "notification_channel_vibration_effect_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/pinner_service_client_api_flag_values.textproto b/aconfig/ap4a/android.app/pinner_service_client_api_flag_values.textproto
new file mode 100644
index 0000000..6a0360b
--- /dev/null
+++ b/aconfig/ap4a/android.app/pinner_service_client_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "pinner_service_client_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/rate_limit_get_memory_info_flag_values.textproto b/aconfig/ap4a/android.app/rate_limit_get_memory_info_flag_values.textproto
new file mode 100644
index 0000000..27c2628
--- /dev/null
+++ b/aconfig/ap4a/android.app/rate_limit_get_memory_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_memory_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/rate_limit_get_my_memory_state_flag_values.textproto b/aconfig/ap4a/android.app/rate_limit_get_my_memory_state_flag_values.textproto
new file mode 100644
index 0000000..b08b226
--- /dev/null
+++ b/aconfig/ap4a/android.app/rate_limit_get_my_memory_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_my_memory_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto b/aconfig/ap4a/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
new file mode 100644
index 0000000..460150d
--- /dev/null
+++ b/aconfig/ap4a/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_processes_in_error_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/rate_limit_get_running_app_processes_flag_values.textproto b/aconfig/ap4a/android.app/rate_limit_get_running_app_processes_flag_values.textproto
new file mode 100644
index 0000000..086791c
--- /dev/null
+++ b/aconfig/ap4a/android.app/rate_limit_get_running_app_processes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_running_app_processes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/restrict_audio_attributes_alarm_flag_values.textproto b/aconfig/ap4a/android.app/restrict_audio_attributes_alarm_flag_values.textproto
new file mode 100644
index 0000000..5aad459
--- /dev/null
+++ b/aconfig/ap4a/android.app/restrict_audio_attributes_alarm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "restrict_audio_attributes_alarm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/restrict_audio_attributes_call_flag_values.textproto b/aconfig/ap4a/android.app/restrict_audio_attributes_call_flag_values.textproto
new file mode 100644
index 0000000..247465a
--- /dev/null
+++ b/aconfig/ap4a/android.app/restrict_audio_attributes_call_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "restrict_audio_attributes_call"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/restrict_audio_attributes_media_flag_values.textproto b/aconfig/ap4a/android.app/restrict_audio_attributes_media_flag_values.textproto
new file mode 100644
index 0000000..d376924
--- /dev/null
+++ b/aconfig/ap4a/android.app/restrict_audio_attributes_media_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "restrict_audio_attributes_media"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/secure_allowlist_token_flag_values.textproto b/aconfig/ap4a/android.app/secure_allowlist_token_flag_values.textproto
new file mode 100644
index 0000000..5f53e83
--- /dev/null
+++ b/aconfig/ap4a/android.app/secure_allowlist_token_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "secure_allowlist_token"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/sort_section_by_time_flag_values.textproto b/aconfig/ap4a/android.app/sort_section_by_time_flag_values.textproto
new file mode 100644
index 0000000..343341f
--- /dev/null
+++ b/aconfig/ap4a/android.app/sort_section_by_time_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "sort_section_by_time"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/system_terms_of_address_enabled_flag_values.textproto b/aconfig/ap4a/android.app/system_terms_of_address_enabled_flag_values.textproto
new file mode 100644
index 0000000..b73b23d
--- /dev/null
+++ b/aconfig/ap4a/android.app/system_terms_of_address_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "system_terms_of_address_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/use_app_info_not_launched_flag_values.textproto b/aconfig/ap4a/android.app/use_app_info_not_launched_flag_values.textproto
new file mode 100644
index 0000000..41b4293
--- /dev/null
+++ b/aconfig/ap4a/android.app/use_app_info_not_launched_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "use_app_info_not_launched"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.app/visit_person_uri_flag_values.textproto b/aconfig/ap4a/android.app/visit_person_uri_flag_values.textproto
new file mode 100644
index 0000000..e355a28
--- /dev/null
+++ b/aconfig/ap4a/android.app/visit_person_uri_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "visit_person_uri"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.appwidget.flags/Android.bp b/aconfig/ap4a/android.appwidget.flags/Android.bp
new file mode 100644
index 0000000..a1e2d64
--- /dev/null
+++ b/aconfig/ap4a/android.appwidget.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-platform_build_release-ap4a-android.appwidget.flags-all",
+  package: "android.appwidget.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.appwidget.flags/draw_data_parcel_flag_values.textproto b/aconfig/ap4a/android.appwidget.flags/draw_data_parcel_flag_values.textproto
new file mode 100644
index 0000000..d52ca58
--- /dev/null
+++ b/aconfig/ap4a/android.appwidget.flags/draw_data_parcel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.appwidget.flags"
+  name: "draw_data_parcel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.appwidget.flags/generated_previews_flag_values.textproto b/aconfig/ap4a/android.appwidget.flags/generated_previews_flag_values.textproto
new file mode 100644
index 0000000..418595a
--- /dev/null
+++ b/aconfig/ap4a/android.appwidget.flags/generated_previews_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.appwidget.flags"
+  name: "generated_previews"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto b/aconfig/ap4a/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto
new file mode 100644
index 0000000..c96563c
--- /dev/null
+++ b/aconfig/ap4a/android.appwidget.flags/remove_app_widget_service_io_from_critical_path_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.appwidget.flags"
+  name: "remove_app_widget_service_io_from_critical_path"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/Android.bp b/aconfig/ap4a/android.car.feature/Android.bp
new file mode 100644
index 0000000..b41148b
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/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-platform_build_release-ap4a-android.car.feature-all",
+  package: "android.car.feature",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.car.feature/android_vic_vehicle_properties_flag_values.textproto b/aconfig/ap4a/android.car.feature/android_vic_vehicle_properties_flag_values.textproto
new file mode 100644
index 0000000..d289a0a
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/android_vic_vehicle_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "android_vic_vehicle_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/area_id_config_access_flag_values.textproto b/aconfig/ap4a/android.car.feature/area_id_config_access_flag_values.textproto
new file mode 100644
index 0000000..c0aa1e9
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/area_id_config_access_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "area_id_config_access"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto b/aconfig/ap4a/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
new file mode 100644
index 0000000..2ac194d
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "audio_vendor_freeze_improvements"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/batched_subscriptions_flag_values.textproto b/aconfig/ap4a/android.car.feature/batched_subscriptions_flag_values.textproto
new file mode 100644
index 0000000..c8f6f97
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/batched_subscriptions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "batched_subscriptions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_app_card_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_app_card_flag_values.textproto
new file mode 100644
index 0000000..9b056a2
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_app_card_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_app_card"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_audio_dynamic_devices_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_audio_dynamic_devices_flag_values.textproto
new file mode 100644
index 0000000..b29a38d
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_audio_dynamic_devices_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_audio_dynamic_devices"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto
new file mode 100644
index 0000000..504799d
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_audio_fade_manager_configuration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_audio_fade_manager_configuration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto
new file mode 100644
index 0000000..a54e15e
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_audio_min_max_activation_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_audio_min_max_activation_volume"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto
new file mode 100644
index 0000000..6e93472
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_audio_mute_ambiguity_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_audio_mute_ambiguity"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_dump_to_proto_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_dump_to_proto_flag_values.textproto
new file mode 100644
index 0000000..fa83f49
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_dump_to_proto_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_dump_to_proto"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_evs_query_service_status_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_evs_query_service_status_flag_values.textproto
new file mode 100644
index 0000000..df7a6ef
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_evs_query_service_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_evs_query_service_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_evs_stream_management_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_evs_stream_management_flag_values.textproto
new file mode 100644
index 0000000..d45ea70
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_evs_stream_management_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_evs_stream_management"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_night_global_setting_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_night_global_setting_flag_values.textproto
new file mode 100644
index 0000000..47c1a1c
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_night_global_setting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_night_global_setting"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_power_policy_refactoring_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_power_policy_refactoring_flag_values.textproto
new file mode 100644
index 0000000..0f6647d
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_power_policy_refactoring_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_power_policy_refactoring"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_property_detailed_error_codes_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_property_detailed_error_codes_flag_values.textproto
new file mode 100644
index 0000000..af5f2ba
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_property_detailed_error_codes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_property_detailed_error_codes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_property_value_property_status_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_property_value_property_status_flag_values.textproto
new file mode 100644
index 0000000..4619833
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_property_value_property_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_property_value_property_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto b/aconfig/ap4a/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto
new file mode 100644
index 0000000..2f37dc3
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/car_watchdog_memory_profiling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_watchdog_memory_profiling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/cluster_health_monitoring_flag_values.textproto b/aconfig/ap4a/android.car.feature/cluster_health_monitoring_flag_values.textproto
new file mode 100644
index 0000000..9979a3b
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/cluster_health_monitoring_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "cluster_health_monitoring"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/display_compatibility_flag_values.textproto b/aconfig/ap4a/android.car.feature/display_compatibility_flag_values.textproto
new file mode 100644
index 0000000..88caf71
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/display_compatibility_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "display_compatibility"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/multi_display_brightness_control_flag_values.textproto b/aconfig/ap4a/android.car.feature/multi_display_brightness_control_flag_values.textproto
new file mode 100644
index 0000000..cd68987
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/multi_display_brightness_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "multi_display_brightness_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto b/aconfig/ap4a/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
new file mode 100644
index 0000000..1d9f20d
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "package_manager_extensions_for_sdv"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/per_display_max_brightness_flag_values.textproto b/aconfig/ap4a/android.car.feature/per_display_max_brightness_flag_values.textproto
new file mode 100644
index 0000000..de641ae
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/per_display_max_brightness_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "per_display_max_brightness"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/persist_ap_settings_flag_values.textproto b/aconfig/ap4a/android.car.feature/persist_ap_settings_flag_values.textproto
new file mode 100644
index 0000000..9f5b0ab
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/persist_ap_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "persist_ap_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto b/aconfig/ap4a/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto
new file mode 100644
index 0000000..da0c5dd
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/projection_query_bt_profile_inhibit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "projection_query_bt_profile_inhibit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/serverless_remote_access_flag_values.textproto b/aconfig/ap4a/android.car.feature/serverless_remote_access_flag_values.textproto
new file mode 100644
index 0000000..8301dc1
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/serverless_remote_access_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "serverless_remote_access"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/subscription_with_resolution_flag_values.textproto b/aconfig/ap4a/android.car.feature/subscription_with_resolution_flag_values.textproto
new file mode 100644
index 0000000..02681fb
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/subscription_with_resolution_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "subscription_with_resolution"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto b/aconfig/ap4a/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto
new file mode 100644
index 0000000..dff2089
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/switch_user_ignoring_uxr_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "switch_user_ignoring_uxr"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/variable_update_rate_flag_values.textproto b/aconfig/ap4a/android.car.feature/variable_update_rate_flag_values.textproto
new file mode 100644
index 0000000..fb56e82
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/variable_update_rate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "variable_update_rate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.car.feature/visible_background_user_restrictions_flag_values.textproto b/aconfig/ap4a/android.car.feature/visible_background_user_restrictions_flag_values.textproto
new file mode 100644
index 0000000..3500e02
--- /dev/null
+++ b/aconfig/ap4a/android.car.feature/visible_background_user_restrictions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "visible_background_user_restrictions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/Android.bp b/aconfig/ap4a/android.chre.flags/Android.bp
new file mode 100644
index 0000000..0bfa60a
--- /dev/null
+++ b/aconfig/ap4a/android.chre.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-platform_build_release-ap4a-android.chre.flags-all",
+  package: "android.chre.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto b/aconfig/ap4a/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
new file mode 100644
index 0000000..151a1af
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "bug_fix_hal_reliable_message_record"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto b/aconfig/ap4a/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto
new file mode 100644
index 0000000..e3b06bf
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/context_hub_callback_uuid_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "context_hub_callback_uuid_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/fix_api_check_flag_values.textproto b/aconfig/ap4a/android.chre.flags/fix_api_check_flag_values.textproto
new file mode 100644
index 0000000..65fbafb
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/fix_api_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "fix_api_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto b/aconfig/ap4a/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
new file mode 100644
index 0000000..b96205c
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reconnect_host_endpoints_after_hal_restart"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto b/aconfig/ap4a/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto
new file mode 100644
index 0000000..d19e21e
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/reliable_message_duplicate_detection_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reliable_message_duplicate_detection_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/reliable_message_flag_values.textproto b/aconfig/ap4a/android.chre.flags/reliable_message_flag_values.textproto
new file mode 100644
index 0000000..ad6e361
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/reliable_message_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reliable_message"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/reliable_message_implementation_flag_values.textproto b/aconfig/ap4a/android.chre.flags/reliable_message_implementation_flag_values.textproto
new file mode 100644
index 0000000..cf77eaa
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/reliable_message_implementation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reliable_message_implementation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto b/aconfig/ap4a/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
new file mode 100644
index 0000000..d8bf477
--- /dev/null
+++ b/aconfig/ap4a/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reliable_message_retry_support_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/Android.bp b/aconfig/ap4a/android.companion.virtual.flags/Android.bp
new file mode 100644
index 0000000..cb7afdd
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.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-platform_build_release-ap4a-android.companion.virtual.flags-all",
+  package: "android.companion.virtual.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto
new file mode 100644
index 0000000..3b28b08
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/cross_device_clipboard_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "cross_device_clipboard"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/dynamic_policy_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/dynamic_policy_flag_values.textproto
new file mode 100644
index 0000000..7fd7c2d
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/dynamic_policy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "dynamic_policy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto
new file mode 100644
index 0000000..7e0fa28
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/enable_native_vdm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "enable_native_vdm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto
new file mode 100644
index 0000000..731ca8d
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/impulse_velocity_strategy_for_touch_navigation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "impulse_velocity_strategy_for_touch_navigation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto
new file mode 100644
index 0000000..bfa3785
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/persistent_device_id_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "persistent_device_id_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto
new file mode 100644
index 0000000..cc4f86e
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_home_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "vdm_custom_home"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto
new file mode 100644
index 0000000..b3202d6
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/vdm_custom_ime_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "vdm_custom_ime"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto
new file mode 100644
index 0000000..7811cc9
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/vdm_public_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "vdm_public_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/virtual_camera_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/virtual_camera_flag_values.textproto
new file mode 100644
index 0000000..fae16d2
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/virtual_camera_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "virtual_camera"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtual.flags/virtual_stylus_flag_values.textproto b/aconfig/ap4a/android.companion.virtual.flags/virtual_stylus_flag_values.textproto
new file mode 100644
index 0000000..65cd8dd
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtual.flags/virtual_stylus_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtual.flags"
+  name: "virtual_stylus"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/Android.bp b/aconfig/ap4a/android.companion.virtualdevice.flags/Android.bp
new file mode 100644
index 0000000..8039e46
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.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-platform_build_release-ap4a-android.companion.virtualdevice.flags-all",
+  package: "android.companion.virtualdevice.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto b/aconfig/ap4a/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto
new file mode 100644
index 0000000..e2e6c4a
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.flags/camera_device_awareness_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "camera_device_awareness"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto b/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto
new file mode 100644
index 0000000..03f129f
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_drm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "device_aware_drm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto b/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto
new file mode 100644
index 0000000..3357b94
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.flags/device_aware_record_audio_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "device_aware_record_audio_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto b/aconfig/ap4a/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
new file mode 100644
index 0000000..9ff814f
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "media_projection_keyguard_restrictions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto b/aconfig/ap4a/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto
new file mode 100644
index 0000000..7f3aa3d
--- /dev/null
+++ b/aconfig/ap4a/android.companion.virtualdevice.flags/virtual_camera_service_discovery_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "virtual_camera_service_discovery"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion/Android.bp b/aconfig/ap4a/android.companion/Android.bp
new file mode 100644
index 0000000..6ef047f
--- /dev/null
+++ b/aconfig/ap4a/android.companion/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-platform_build_release-ap4a-android.companion-all",
+  package: "android.companion",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.companion/new_association_builder_flag_values.textproto b/aconfig/ap4a/android.companion/new_association_builder_flag_values.textproto
new file mode 100644
index 0000000..53ca41e
--- /dev/null
+++ b/aconfig/ap4a/android.companion/new_association_builder_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion"
+  name: "new_association_builder"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.companion/perm_sync_user_consent_flag_values.textproto b/aconfig/ap4a/android.companion/perm_sync_user_consent_flag_values.textproto
new file mode 100644
index 0000000..b92cfe2
--- /dev/null
+++ b/aconfig/ap4a/android.companion/perm_sync_user_consent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion"
+  name: "perm_sync_user_consent"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.flags/Android.bp b/aconfig/ap4a/android.content.flags/Android.bp
new file mode 100644
index 0000000..d78f3bd
--- /dev/null
+++ b/aconfig/ap4a/android.content.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-platform_build_release-ap4a-android.content.flags-all",
+  package: "android.content.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto b/aconfig/ap4a/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto
new file mode 100644
index 0000000..95cdf8e
--- /dev/null
+++ b/aconfig/ap4a/android.content.flags/enable_bind_package_isolated_process_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.flags"
+  name: "enable_bind_package_isolated_process"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/Android.bp b/aconfig/ap4a/android.content.pm/Android.bp
new file mode 100644
index 0000000..a0302f9
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/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-platform_build_release-ap4a-android.content.pm-all",
+  package: "android.content.pm",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto b/aconfig/ap4a/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto
new file mode 100644
index 0000000..2bf14b6
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/allow_sdk_sandbox_query_intent_activities_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "allow_sdk_sandbox_query_intent_activities"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/archiving_flag_values.textproto b/aconfig/ap4a/android.content.pm/archiving_flag_values.textproto
new file mode 100644
index 0000000..2885b99
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/archiving_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "archiving"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto b/aconfig/ap4a/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto
new file mode 100644
index 0000000..379d2d0
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/asl_in_apk_app_metadata_source_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "asl_in_apk_app_metadata_source"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/component_state_changed_metrics_flag_values.textproto b/aconfig/ap4a/android.content.pm/component_state_changed_metrics_flag_values.textproto
new file mode 100644
index 0000000..dfa1c5f
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/component_state_changed_metrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "component_state_changed_metrics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/emergency_install_permission_flag_values.textproto b/aconfig/ap4a/android.content.pm/emergency_install_permission_flag_values.textproto
new file mode 100644
index 0000000..e1a0f5c
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/emergency_install_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "emergency_install_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/encode_app_intent_flag_values.textproto b/aconfig/ap4a/android.content.pm/encode_app_intent_flag_values.textproto
new file mode 100644
index 0000000..3ad67a1
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/encode_app_intent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "encode_app_intent"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/fix_duplicated_flags_flag_values.textproto b/aconfig/ap4a/android.content.pm/fix_duplicated_flags_flag_values.textproto
new file mode 100644
index 0000000..ddfc7f5
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/fix_duplicated_flags_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "fix_duplicated_flags"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto b/aconfig/ap4a/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto
new file mode 100644
index 0000000..82cd495
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/fix_system_apps_first_install_time_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "fix_system_apps_first_install_time"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto b/aconfig/ap4a/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto
new file mode 100644
index 0000000..455fdda
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/force_multi_arch_native_libs_match_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "force_multi_arch_native_libs_match"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/get_package_info_flag_values.textproto b/aconfig/ap4a/android.content.pm/get_package_info_flag_values.textproto
new file mode 100644
index 0000000..934a131
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/get_package_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "get_package_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/get_package_storage_stats_flag_values.textproto b/aconfig/ap4a/android.content.pm/get_package_storage_stats_flag_values.textproto
new file mode 100644
index 0000000..558ef85
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/get_package_storage_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "get_package_storage_stats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/get_resolved_apk_path_flag_values.textproto b/aconfig/ap4a/android.content.pm/get_resolved_apk_path_flag_values.textproto
new file mode 100644
index 0000000..c96fd8d
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/get_resolved_apk_path_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "get_resolved_apk_path"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/improve_home_app_behavior_flag_values.textproto b/aconfig/ap4a/android.content.pm/improve_home_app_behavior_flag_values.textproto
new file mode 100644
index 0000000..7c0e86b
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/improve_home_app_behavior_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "improve_home_app_behavior"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/improve_install_dont_kill_flag_values.textproto b/aconfig/ap4a/android.content.pm/improve_install_dont_kill_flag_values.textproto
new file mode 100644
index 0000000..341b604
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/improve_install_dont_kill_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "improve_install_dont_kill"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/introduce_media_processing_type_flag_values.textproto b/aconfig/ap4a/android.content.pm/introduce_media_processing_type_flag_values.textproto
new file mode 100644
index 0000000..8bc45ec
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/introduce_media_processing_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "introduce_media_processing_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto b/aconfig/ap4a/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto
new file mode 100644
index 0000000..e6855a1
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/lightweight_invisible_label_detection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "lightweight_invisible_label_detection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/min_target_sdk_24_flag_values.textproto b/aconfig/ap4a/android.content.pm/min_target_sdk_24_flag_values.textproto
new file mode 100644
index 0000000..4869339
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/min_target_sdk_24_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "min_target_sdk_24"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/nullable_data_dir_flag_values.textproto b/aconfig/ap4a/android.content.pm/nullable_data_dir_flag_values.textproto
new file mode 100644
index 0000000..0e34c99
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/nullable_data_dir_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "nullable_data_dir"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto b/aconfig/ap4a/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto
new file mode 100644
index 0000000..3f2dc38
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/package_restart_query_disabled_by_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "package_restart_query_disabled_by_default"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto b/aconfig/ap4a/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto
new file mode 100644
index 0000000..830337c
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/provide_info_of_apk_in_apex_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "provide_info_of_apk_in_apex"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/read_install_info_flag_values.textproto b/aconfig/ap4a/android.content.pm/read_install_info_flag_values.textproto
new file mode 100644
index 0000000..8d68079
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/read_install_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "read_install_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/recoverability_detection_flag_values.textproto b/aconfig/ap4a/android.content.pm/recoverability_detection_flag_values.textproto
new file mode 100644
index 0000000..47b7aba
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/recoverability_detection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "recoverability_detection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/relative_reference_intent_filters_flag_values.textproto b/aconfig/ap4a/android.content.pm/relative_reference_intent_filters_flag_values.textproto
new file mode 100644
index 0000000..4433a8a
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/relative_reference_intent_filters_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "relative_reference_intent_filters"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto b/aconfig/ap4a/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto
new file mode 100644
index 0000000..0f1a081
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/restrict_nonpreloads_system_shareduids_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "restrict_nonpreloads_system_shareduids"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/rollback_lifetime_flag_values.textproto b/aconfig/ap4a/android.content.pm/rollback_lifetime_flag_values.textproto
new file mode 100644
index 0000000..a39d818
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/rollback_lifetime_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "rollback_lifetime"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/set_pre_verified_domains_flag_values.textproto b/aconfig/ap4a/android.content.pm/set_pre_verified_domains_flag_values.textproto
new file mode 100644
index 0000000..70539d1
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/set_pre_verified_domains_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "set_pre_verified_domains"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/stay_stopped_flag_values.textproto b/aconfig/ap4a/android.content.pm/stay_stopped_flag_values.textproto
new file mode 100644
index 0000000..3b997e8
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/stay_stopped_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "stay_stopped"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/use_art_service_v2_flag_values.textproto b/aconfig/ap4a/android.content.pm/use_art_service_v2_flag_values.textproto
new file mode 100644
index 0000000..d2bb4e2
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/use_art_service_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "use_art_service_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.pm/wait_application_killed_flag_values.textproto b/aconfig/ap4a/android.content.pm/wait_application_killed_flag_values.textproto
new file mode 100644
index 0000000..9b75b6e
--- /dev/null
+++ b/aconfig/ap4a/android.content.pm/wait_application_killed_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "wait_application_killed"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/Android.bp b/aconfig/ap4a/android.content.res/Android.bp
new file mode 100644
index 0000000..f5ee7cb
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/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-platform_build_release-ap4a-android.content.res-all",
+  package: "android.content.res",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.content.res/asset_file_descriptor_frro_flag_values.textproto b/aconfig/ap4a/android.content.res/asset_file_descriptor_frro_flag_values.textproto
new file mode 100644
index 0000000..0daf79a
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/asset_file_descriptor_frro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "asset_file_descriptor_frro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/default_locale_flag_values.textproto b/aconfig/ap4a/android.content.res/default_locale_flag_values.textproto
new file mode 100644
index 0000000..b094c31
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/default_locale_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "default_locale"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/font_scale_converter_public_flag_values.textproto b/aconfig/ap4a/android.content.res/font_scale_converter_public_flag_values.textproto
new file mode 100644
index 0000000..cce2065
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/font_scale_converter_public_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "font_scale_converter_public"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/manifest_flagging_flag_values.textproto b/aconfig/ap4a/android.content.res/manifest_flagging_flag_values.textproto
new file mode 100644
index 0000000..0c6cef2
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/manifest_flagging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "manifest_flagging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/nine_patch_frro_flag_values.textproto b/aconfig/ap4a/android.content.res/nine_patch_frro_flag_values.textproto
new file mode 100644
index 0000000..39cd359
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/nine_patch_frro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "nine_patch_frro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.content.res/register_resource_paths_flag_values.textproto b/aconfig/ap4a/android.content.res/register_resource_paths_flag_values.textproto
new file mode 100644
index 0000000..1a57d18
--- /dev/null
+++ b/aconfig/ap4a/android.content.res/register_resource_paths_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "register_resource_paths"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.crashrecovery.flags/Android.bp b/aconfig/ap4a/android.crashrecovery.flags/Android.bp
new file mode 100644
index 0000000..13adf26
--- /dev/null
+++ b/aconfig/ap4a/android.crashrecovery.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-platform_build_release-ap4a-android.crashrecovery.flags-all",
+  package: "android.crashrecovery.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto b/aconfig/ap4a/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
new file mode 100644
index 0000000..7942291
--- /dev/null
+++ b/aconfig/ap4a/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.crashrecovery.flags"
+  name: "deprecate_flags_and_settings_resets"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.crashrecovery.flags/recoverability_detection_flag_values.textproto b/aconfig/ap4a/android.crashrecovery.flags/recoverability_detection_flag_values.textproto
new file mode 100644
index 0000000..61ab4d5
--- /dev/null
+++ b/aconfig/ap4a/android.crashrecovery.flags/recoverability_detection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.crashrecovery.flags"
+  name: "recoverability_detection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/Android.bp b/aconfig/ap4a/android.credentials.flags/Android.bp
new file mode 100644
index 0000000..4bcaea7
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.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-platform_build_release-ap4a-android.credentials.flags-all",
+  package: "android.credentials.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto
new file mode 100644
index 0000000..9f32258
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/clear_credentials_fix_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "clear_credentials_fix_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/clear_session_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/clear_session_enabled_flag_values.textproto
new file mode 100644
index 0000000..fb52580
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/clear_session_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "clear_session_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto
new file mode 100644
index 0000000..fe9cd86
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/configurable_selector_ui_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "configurable_selector_ui_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..f8c812c
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/credman_biometric_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "credman_biometric_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto
new file mode 100644
index 0000000..e309c21
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/hybrid_filter_opt_fix_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "hybrid_filter_opt_fix_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/instant_apps_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/instant_apps_enabled_flag_values.textproto
new file mode 100644
index 0000000..f49b565
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/instant_apps_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "instant_apps_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/new_settings_intents_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/new_settings_intents_flag_values.textproto
new file mode 100644
index 0000000..76e7c50
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/new_settings_intents_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "new_settings_intents"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/new_settings_ui_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/new_settings_ui_flag_values.textproto
new file mode 100644
index 0000000..679cdbe
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/new_settings_ui_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "new_settings_ui"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto
new file mode 100644
index 0000000..6604eb2
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/selector_ui_improvements_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "selector_ui_improvements_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/settings_activity_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/settings_activity_enabled_flag_values.textproto
new file mode 100644
index 0000000..42e5f29
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/settings_activity_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "settings_activity_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.credentials.flags/wear_credential_manager_enabled_flag_values.textproto b/aconfig/ap4a/android.credentials.flags/wear_credential_manager_enabled_flag_values.textproto
new file mode 100644
index 0000000..e4127c6
--- /dev/null
+++ b/aconfig/ap4a/android.credentials.flags/wear_credential_manager_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.credentials.flags"
+  name: "wear_credential_manager_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.database.sqlite/Android.bp b/aconfig/ap4a/android.database.sqlite/Android.bp
new file mode 100644
index 0000000..51effff
--- /dev/null
+++ b/aconfig/ap4a/android.database.sqlite/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-platform_build_release-ap4a-android.database.sqlite-all",
+  package: "android.database.sqlite",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto b/aconfig/ap4a/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto
new file mode 100644
index 0000000..ed58259
--- /dev/null
+++ b/aconfig/ap4a/android.database.sqlite/simple_sql_comment_scanner_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.database.sqlite"
+  name: "simple_sql_comment_scanner"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto b/aconfig/ap4a/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto
new file mode 100644
index 0000000..fdb5a89
--- /dev/null
+++ b/aconfig/ap4a/android.database.sqlite/sqlite_allow_temp_tables_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.database.sqlite"
+  name: "sqlite_allow_temp_tables"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.database.sqlite/sqlite_apis_35_flag_values.textproto b/aconfig/ap4a/android.database.sqlite/sqlite_apis_35_flag_values.textproto
new file mode 100644
index 0000000..c5c3c95
--- /dev/null
+++ b/aconfig/ap4a/android.database.sqlite/sqlite_apis_35_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.database.sqlite"
+  name: "sqlite_apis_35"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.graphics.pdf.flags/Android.bp b/aconfig/ap4a/android.graphics.pdf.flags/Android.bp
new file mode 100644
index 0000000..9423f41
--- /dev/null
+++ b/aconfig/ap4a/android.graphics.pdf.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-platform_build_release-ap4a-android.graphics.pdf.flags-all",
+  package: "android.graphics.pdf.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto b/aconfig/ap4a/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto
new file mode 100644
index 0000000..bede648
--- /dev/null
+++ b/aconfig/ap4a/android.graphics.pdf.flags/enable_form_filling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.graphics.pdf.flags"
+  name: "enable_form_filling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto b/aconfig/ap4a/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto
new file mode 100644
index 0000000..c9e3d51
--- /dev/null
+++ b/aconfig/ap4a/android.graphics.pdf.flags/enable_pdf_viewer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.graphics.pdf.flags"
+  name: "enable_pdf_viewer"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.biometrics/Android.bp b/aconfig/ap4a/android.hardware.biometrics/Android.bp
new file mode 100644
index 0000000..2ceb9be
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.biometrics/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-platform_build_release-ap4a-android.hardware.biometrics-all",
+  package: "android.hardware.biometrics",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto b/aconfig/ap4a/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto
new file mode 100644
index 0000000..7915f44
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.biometrics/custom_biometric_prompt_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.biometrics"
+  name: "custom_biometric_prompt"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto b/aconfig/ap4a/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto
new file mode 100644
index 0000000..0026f81
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.biometrics/get_op_id_crypto_object_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.biometrics"
+  name: "get_op_id_crypto_object"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.biometrics/last_authentication_time_flag_values.textproto b/aconfig/ap4a/android.hardware.biometrics/last_authentication_time_flag_values.textproto
new file mode 100644
index 0000000..55a6884
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.biometrics/last_authentication_time_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.biometrics"
+  name: "last_authentication_time"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto b/aconfig/ap4a/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
new file mode 100644
index 0000000..e535668
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.biometrics"
+  name: "mandatory_biometrics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.devicestate.feature.flags/Android.bp b/aconfig/ap4a/android.hardware.devicestate.feature.flags/Android.bp
new file mode 100644
index 0000000..666d814
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.devicestate.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-platform_build_release-ap4a-android.hardware.devicestate.feature.flags-all",
+  package: "android.hardware.devicestate.feature.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto b/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto
new file mode 100644
index 0000000..46b1bbe
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_property_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.devicestate.feature.flags"
+  name: "device_state_property_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto b/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
new file mode 100644
index 0000000..0bf8cc0
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.devicestate.feature.flags"
+  name: "device_state_requester_cancel_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.flags/Android.bp b/aconfig/ap4a/android.hardware.flags/Android.bp
new file mode 100644
index 0000000..8cf28e0
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.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-platform_build_release-ap4a-android.hardware.flags-all",
+  package: "android.hardware.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.hardware.flags/overlayproperties_class_api_flag_values.textproto b/aconfig/ap4a/android.hardware.flags/overlayproperties_class_api_flag_values.textproto
new file mode 100644
index 0000000..3ccf866
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.flags/overlayproperties_class_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.flags"
+  name: "overlayproperties_class_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.radio/Android.bp b/aconfig/ap4a/android.hardware.radio/Android.bp
new file mode 100644
index 0000000..71e5a66
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.radio/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-platform_build_release-ap4a-android.hardware.radio-all",
+  package: "android.hardware.radio",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.hardware.radio/hd_radio_improved_flag_values.textproto b/aconfig/ap4a/android.hardware.radio/hd_radio_improved_flag_values.textproto
new file mode 100644
index 0000000..bdef450
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.radio/hd_radio_improved_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.radio"
+  name: "hd_radio_improved"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/Android.bp b/aconfig/ap4a/android.hardware.usb.flags/Android.bp
new file mode 100644
index 0000000..703d830
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.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-platform_build_release-ap4a-android.hardware.usb.flags-all",
+  package: "android.hardware.usb.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto
new file mode 100644
index 0000000..80de408
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_input_power_limited_warning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_input_power_limited_warning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto
new file mode 100644
index 0000000..eaa6b59
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_interface_name_device_filter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_interface_name_device_filter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto
new file mode 100644
index 0000000..59cfa6f
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_is_mode_change_supported_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_is_mode_change_supported_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto
new file mode 100644
index 0000000..079ffd4
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_is_pd_compliant_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_is_pd_compliant_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto
new file mode 100644
index 0000000..646cfdb
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_report_usb_data_compliance_warning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_report_usb_data_compliance_warning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto
new file mode 100644
index 0000000..df43050
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_compliance_warning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_usb_data_compliance_warning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto b/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto
new file mode 100644
index 0000000..b6e9eef
--- /dev/null
+++ b/aconfig/ap4a/android.hardware.usb.flags/enable_usb_data_signal_staking_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_usb_data_signal_staking"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/Android.bp b/aconfig/ap4a/android.location.flags/Android.bp
new file mode 100644
index 0000000..a33a891
--- /dev/null
+++ b/aconfig/ap4a/android.location.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-platform_build_release-ap4a-android.location.flags-all",
+  package: "android.location.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.location.flags/disable_stationary_throttling_flag_values.textproto b/aconfig/ap4a/android.location.flags/disable_stationary_throttling_flag_values.textproto
new file mode 100644
index 0000000..5c781bc
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/disable_stationary_throttling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "disable_stationary_throttling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/enable_location_bypass_flag_values.textproto b/aconfig/ap4a/android.location.flags/enable_location_bypass_flag_values.textproto
new file mode 100644
index 0000000..8a15161
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/enable_location_bypass_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "enable_location_bypass"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/fix_service_watcher_flag_values.textproto b/aconfig/ap4a/android.location.flags/fix_service_watcher_flag_values.textproto
new file mode 100644
index 0000000..c72030a
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/fix_service_watcher_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "fix_service_watcher"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto b/aconfig/ap4a/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto
new file mode 100644
index 0000000..a17fccc
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/geoid_heights_via_altitude_hal_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "geoid_heights_via_altitude_hal"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto b/aconfig/ap4a/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto
new file mode 100644
index 0000000..9aea6aa
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/gnss_api_measurement_request_work_source_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "gnss_api_measurement_request_work_source"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/gnss_api_navic_l1_flag_values.textproto b/aconfig/ap4a/android.location.flags/gnss_api_navic_l1_flag_values.textproto
new file mode 100644
index 0000000..94e19d5
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/gnss_api_navic_l1_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "gnss_api_navic_l1"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/gnss_configuration_from_resource_flag_values.textproto b/aconfig/ap4a/android.location.flags/gnss_configuration_from_resource_flag_values.textproto
new file mode 100644
index 0000000..d281edc
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/gnss_configuration_from_resource_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "gnss_configuration_from_resource"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/location_bypass_flag_values.textproto b/aconfig/ap4a/android.location.flags/location_bypass_flag_values.textproto
new file mode 100644
index 0000000..891937c
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/location_bypass_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "location_bypass"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/location_validation_flag_values.textproto b/aconfig/ap4a/android.location.flags/location_validation_flag_values.textproto
new file mode 100644
index 0000000..6425c23
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/location_validation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "location_validation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/new_geocoder_flag_values.textproto b/aconfig/ap4a/android.location.flags/new_geocoder_flag_values.textproto
new file mode 100644
index 0000000..42b2638
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/new_geocoder_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "new_geocoder"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto b/aconfig/ap4a/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto
new file mode 100644
index 0000000..98d897c
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/release_supl_connection_on_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "release_supl_connection_on_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto b/aconfig/ap4a/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto
new file mode 100644
index 0000000..4b7e723
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/replace_future_elapsed_realtime_jni_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "replace_future_elapsed_realtime_jni"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto b/aconfig/ap4a/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto
new file mode 100644
index 0000000..cbc3d2d
--- /dev/null
+++ b/aconfig/ap4a/android.location.flags/subscriptions_changed_listener_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "subscriptions_changed_listener_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/Android.bp b/aconfig/ap4a/android.media.audio/Android.bp
new file mode 100644
index 0000000..4a1dc72
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/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-platform_build_release-ap4a-android.media.audio-all",
+  package: "android.media.audio",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.media.audio/automatic_bt_device_type_flag_values.textproto b/aconfig/ap4a/android.media.audio/automatic_bt_device_type_flag_values.textproto
new file mode 100644
index 0000000..2e87f93
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/automatic_bt_device_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "automatic_bt_device_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/focus_exclusive_with_recording_flag_values.textproto b/aconfig/ap4a/android.media.audio/focus_exclusive_with_recording_flag_values.textproto
new file mode 100644
index 0000000..6634189
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/focus_exclusive_with_recording_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "focus_exclusive_with_recording"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/focus_freeze_test_api_flag_values.textproto b/aconfig/ap4a/android.media.audio/focus_freeze_test_api_flag_values.textproto
new file mode 100644
index 0000000..da98558
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/focus_freeze_test_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "focus_freeze_test_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/loudness_configurator_api_flag_values.textproto b/aconfig/ap4a/android.media.audio/loudness_configurator_api_flag_values.textproto
new file mode 100644
index 0000000..9792d2e
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/loudness_configurator_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "loudness_configurator_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/ro_foreground_audio_control_flag_values.textproto b/aconfig/ap4a/android.media.audio/ro_foreground_audio_control_flag_values.textproto
new file mode 100644
index 0000000..0cbe124
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/ro_foreground_audio_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "ro_foreground_audio_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audio/supported_device_types_api_flag_values.textproto b/aconfig/ap4a/android.media.audio/supported_device_types_api_flag_values.textproto
new file mode 100644
index 0000000..ab8630c
--- /dev/null
+++ b/aconfig/ap4a/android.media.audio/supported_device_types_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "supported_device_types_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/Android.bp b/aconfig/ap4a/android.media.audiopolicy/Android.bp
new file mode 100644
index 0000000..b9249cd
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/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-platform_build_release-ap4a-android.media.audiopolicy-all",
+  package: "android.media.audiopolicy",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto b/aconfig/ap4a/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto
new file mode 100644
index 0000000..278b3a0
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/audio_mix_ownership_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audiopolicy"
+  name: "audio_mix_ownership"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto b/aconfig/ap4a/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto
new file mode 100644
index 0000000..4efcb85
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/audio_mix_test_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audiopolicy"
+  name: "audio_mix_test_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto b/aconfig/ap4a/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto
new file mode 100644
index 0000000..b0b6251
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/audio_policy_update_mixing_rules_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audiopolicy"
+  name: "audio_policy_update_mixing_rules_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto b/aconfig/ap4a/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto
new file mode 100644
index 0000000..cc124b4
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/enable_fade_manager_configuration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audiopolicy"
+  name: "enable_fade_manager_configuration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto b/aconfig/ap4a/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto
new file mode 100644
index 0000000..da05df6
--- /dev/null
+++ b/aconfig/ap4a/android.media.audiopolicy/record_audio_device_aware_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audiopolicy"
+  name: "record_audio_device_aware_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/Android.bp b/aconfig/ap4a/android.media.codec/Android.bp
new file mode 100644
index 0000000..58d4333
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/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-platform_build_release-ap4a-android.media.codec-all",
+  package: "android.media.codec",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.media.codec/dynamic_color_aspects_flag_values.textproto b/aconfig/ap4a/android.media.codec/dynamic_color_aspects_flag_values.textproto
new file mode 100644
index 0000000..5719600
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/dynamic_color_aspects_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "dynamic_color_aspects"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/hlg_editing_flag_values.textproto b/aconfig/ap4a/android.media.codec/hlg_editing_flag_values.textproto
new file mode 100644
index 0000000..b886d87
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/hlg_editing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "hlg_editing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/input_surface_throttle_flag_values.textproto b/aconfig/ap4a/android.media.codec/input_surface_throttle_flag_values.textproto
new file mode 100644
index 0000000..64a3e54
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/input_surface_throttle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "input_surface_throttle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/large_audio_frame_finish_flag_values.textproto b/aconfig/ap4a/android.media.codec/large_audio_frame_finish_flag_values.textproto
new file mode 100644
index 0000000..be574c6
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/large_audio_frame_finish_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "large_audio_frame_finish"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/null_output_surface_flag_values.textproto b/aconfig/ap4a/android.media.codec/null_output_surface_flag_values.textproto
new file mode 100644
index 0000000..b6c21a2
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/null_output_surface_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "null_output_surface"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/null_output_surface_support_flag_values.textproto b/aconfig/ap4a/android.media.codec/null_output_surface_support_flag_values.textproto
new file mode 100644
index 0000000..a36a380
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/null_output_surface_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "null_output_surface_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/region_of_interest_flag_values.textproto b/aconfig/ap4a/android.media.codec/region_of_interest_flag_values.textproto
new file mode 100644
index 0000000..c8ac33b
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/region_of_interest_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "region_of_interest"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/region_of_interest_support_flag_values.textproto b/aconfig/ap4a/android.media.codec/region_of_interest_support_flag_values.textproto
new file mode 100644
index 0000000..9b506f5
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/region_of_interest_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "region_of_interest_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/set_state_early_flag_values.textproto b/aconfig/ap4a/android.media.codec/set_state_early_flag_values.textproto
new file mode 100644
index 0000000..775588d
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/set_state_early_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "set_state_early"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.codec/stop_hal_before_surface_flag_values.textproto b/aconfig/ap4a/android.media.codec/stop_hal_before_surface_flag_values.textproto
new file mode 100644
index 0000000..db5fb39
--- /dev/null
+++ b/aconfig/ap4a/android.media.codec/stop_hal_before_surface_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "stop_hal_before_surface"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.media.midi/Android.bp b/aconfig/ap4a/android.media.midi/Android.bp
new file mode 100644
index 0000000..9030f96
--- /dev/null
+++ b/aconfig/ap4a/android.media.midi/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-platform_build_release-ap4a-android.media.midi-all",
+  package: "android.media.midi",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.media.midi/virtual_ump_flag_values.textproto b/aconfig/ap4a/android.media.midi/virtual_ump_flag_values.textproto
new file mode 100644
index 0000000..a746ba2
--- /dev/null
+++ b/aconfig/ap4a/android.media.midi/virtual_ump_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.midi"
+  name: "virtual_ump"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/Android.bp b/aconfig/ap4a/android.multiuser/Android.bp
new file mode 100644
index 0000000..89c848f
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/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-platform_build_release-ap4a-android.multiuser-all",
+  package: "android.multiuser",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto b/aconfig/ap4a/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
new file mode 100644
index 0000000..41c6b41
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "add_ui_for_sounds_from_background_users"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto b/aconfig/ap4a/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto
new file mode 100644
index 0000000..6756b65
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/allow_main_user_to_access_blocked_number_provider_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "allow_main_user_to_access_blocked_number_provider"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto b/aconfig/ap4a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
new file mode 100644
index 0000000..9d1b961
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/allow_resolver_sheet_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "allow_resolver_sheet_for_private_space"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/avatar_sync_flag_values.textproto b/aconfig/ap4a/android.multiuser/avatar_sync_flag_values.textproto
new file mode 100644
index 0000000..03dbec4
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/avatar_sync_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "avatar_sync"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto b/aconfig/ap4a/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto
new file mode 100644
index 0000000..91d3f00
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/bind_wallpaper_service_on_its_own_thread_during_a_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "bind_wallpaper_service_on_its_own_thread_during_a_user_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/block_private_space_creation_flag_values.textproto b/aconfig/ap4a/android.multiuser/block_private_space_creation_flag_values.textproto
new file mode 100644
index 0000000..77284a1
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/block_private_space_creation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "block_private_space_creation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/cache_quiet_mode_state_flag_values.textproto b/aconfig/ap4a/android.multiuser/cache_quiet_mode_state_flag_values.textproto
new file mode 100644
index 0000000..e7efaa7
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/cache_quiet_mode_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_quiet_mode_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/cache_user_serial_number_flag_values.textproto b/aconfig/ap4a/android.multiuser/cache_user_serial_number_flag_values.textproto
new file mode 100644
index 0000000..3730f52
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/cache_user_serial_number_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_user_serial_number"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto b/aconfig/ap4a/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
new file mode 100644
index 0000000..1d985e1
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_user_serial_number_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto b/aconfig/ap4a/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
new file mode 100644
index 0000000..1cfea6e
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "caches_not_invalidated_at_start_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/delete_private_space_from_reset_flag_values.textproto b/aconfig/ap4a/android.multiuser/delete_private_space_from_reset_flag_values.textproto
new file mode 100644
index 0000000..62e3db8
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/delete_private_space_from_reset_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "delete_private_space_from_reset"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto b/aconfig/ap4a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
new file mode 100644
index 0000000..ea94e32
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/disable_private_space_items_on_home_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "disable_private_space_items_on_home"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
new file mode 100644
index 0000000..54da62b
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_biometrics_to_unlock_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_biometrics_to_unlock_private_space"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_hiding_profiles_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_hiding_profiles_flag_values.textproto
new file mode 100644
index 0000000..8fc19b0
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_hiding_profiles_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_hiding_profiles"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto
new file mode 100644
index 0000000..e1fd440
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_launcher_apps_hidden_profile_checks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_launcher_apps_hidden_profile_checks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto
new file mode 100644
index 0000000..35780c2
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_permission_to_access_hidden_profiles_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_permission_to_access_hidden_profiles"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
new file mode 100644
index 0000000..4769ba4
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_private_space_autolock_on_restarts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_private_space_autolock_on_restarts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_private_space_features_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_private_space_features_flag_values.textproto
new file mode 100644
index 0000000..0770d8a
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_private_space_features_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_private_space_features"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
new file mode 100644
index 0000000..288d54d
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_private_space_intent_redirection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_private_space_intent_redirection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto
new file mode 100644
index 0000000..f0f2335
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_ps_sensitive_notifications_toggle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_ps_sensitive_notifications_toggle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto b/aconfig/ap4a/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto
new file mode 100644
index 0000000..980c4e1
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/enable_system_user_only_for_services_and_providers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "enable_system_user_only_for_services_and_providers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
new file mode 100644
index 0000000..68514f7
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_concurrent_file_write"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
new file mode 100644
index 0000000..dfc3e3e
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_picker_not_responding_for_new_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto
new file mode 100644
index 0000000..a3eb548
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_avatar_picker_read_back_order_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_picker_read_back_order"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto
new file mode 100644
index 0000000..e54c18c
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_avatar_picker_selected_read_back_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_picker_selected_read_back"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
new file mode 100644
index 0000000..871eebb
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_disabling_of_mu_toggle_when_restriction_applied"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/fix_get_user_property_cache_flag_values.textproto b/aconfig/ap4a/android.multiuser/fix_get_user_property_cache_flag_values.textproto
new file mode 100644
index 0000000..34d1eae
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/fix_get_user_property_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_get_user_property_cache"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto b/aconfig/ap4a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
new file mode 100644
index 0000000..a21fb5f
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/handle_interleaved_settings_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "handle_interleaved_settings_for_private_space"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto b/aconfig/ap4a/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto
new file mode 100644
index 0000000..e137635
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/move_quiet_mode_operations_to_separate_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "move_quiet_mode_operations_to_separate_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/new_multiuser_settings_ux_flag_values.textproto b/aconfig/ap4a/android.multiuser/new_multiuser_settings_ux_flag_values.textproto
new file mode 100644
index 0000000..05ae73e
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/new_multiuser_settings_ux_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "new_multiuser_settings_ux"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto b/aconfig/ap4a/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto
new file mode 100644
index 0000000..06063e3
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/reorder_wallpaper_during_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "reorder_wallpaper_during_user_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto b/aconfig/ap4a/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto
new file mode 100644
index 0000000..3b7e0e6
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/restrict_quiet_mode_credential_bug_fix_to_managed_profiles_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "restrict_quiet_mode_credential_bug_fix_to_managed_profiles"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto b/aconfig/ap4a/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto
new file mode 100644
index 0000000..c630285
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/save_global_and_guest_restrictions_on_system_user_xml_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "save_global_and_guest_restrictions_on_system_user_xml_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto b/aconfig/ap4a/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto
new file mode 100644
index 0000000..2fb164e
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/set_power_mode_during_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "set_power_mode_during_user_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto b/aconfig/ap4a/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto
new file mode 100644
index 0000000..51b8269
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/show_set_screen_lock_dialog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "show_set_screen_lock_dialog"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/support_autolock_for_private_space_flag_values.textproto b/aconfig/ap4a/android.multiuser/support_autolock_for_private_space_flag_values.textproto
new file mode 100644
index 0000000..dceca5b
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/support_autolock_for_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "support_autolock_for_private_space"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto b/aconfig/ap4a/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
new file mode 100644
index 0000000..8918f62
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "unicorn_mode_refactoring_for_hsum_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto b/aconfig/ap4a/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto
new file mode 100644
index 0000000..a8740ba
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/use_all_cpus_during_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "use_all_cpus_during_user_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto b/aconfig/ap4a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
new file mode 100644
index 0000000..42c2a46
--- /dev/null
+++ b/aconfig/ap4a/android.multiuser/use_private_space_icon_in_biometric_prompt_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "use_private_space_icon_in_biometric_prompt"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.platform.flags/Android.bp b/aconfig/ap4a/android.net.platform.flags/Android.bp
new file mode 100644
index 0000000..cafd8de
--- /dev/null
+++ b/aconfig/ap4a/android.net.platform.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-platform_build_release-ap4a-android.net.platform.flags-all",
+  package: "android.net.platform.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto b/aconfig/ap4a/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto
new file mode 100644
index 0000000..5e64543
--- /dev/null
+++ b/aconfig/ap4a/android.net.platform.flags/powered_off_finding_platform_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.platform.flags"
+  name: "powered_off_finding_platform"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/Android.bp b/aconfig/ap4a/android.net.vcn/Android.bp
new file mode 100644
index 0000000..0da6eb5
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/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-platform_build_release-ap4a-android.net.vcn-all",
+  package: "android.net.vcn",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.net.vcn/enforce_main_user_flag_values.textproto b/aconfig/ap4a/android.net.vcn/enforce_main_user_flag_values.textproto
new file mode 100644
index 0000000..b6e6a5d
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/enforce_main_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "enforce_main_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto b/aconfig/ap4a/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto
new file mode 100644
index 0000000..e76be86
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/evaluate_ipsec_loss_on_lp_nc_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "evaluate_ipsec_loss_on_lp_nc_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/handle_seq_num_leap_flag_values.textproto b/aconfig/ap4a/android.net.vcn/handle_seq_num_leap_flag_values.textproto
new file mode 100644
index 0000000..15e8735
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/handle_seq_num_leap_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "handle_seq_num_leap"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/network_metric_monitor_flag_values.textproto b/aconfig/ap4a/android.net.vcn/network_metric_monitor_flag_values.textproto
new file mode 100644
index 0000000..a698e29
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/network_metric_monitor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "network_metric_monitor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/safe_mode_config_flag_values.textproto b/aconfig/ap4a/android.net.vcn/safe_mode_config_flag_values.textproto
new file mode 100644
index 0000000..c1a7fbd
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/safe_mode_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "safe_mode_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/safe_mode_timeout_config_flag_values.textproto b/aconfig/ap4a/android.net.vcn/safe_mode_timeout_config_flag_values.textproto
new file mode 100644
index 0000000..0aaacc8
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/safe_mode_timeout_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "safe_mode_timeout_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto b/aconfig/ap4a/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto
new file mode 100644
index 0000000..c841c18
--- /dev/null
+++ b/aconfig/ap4a/android.net.vcn/validate_network_on_ipsec_loss_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.vcn"
+  name: "validate_network_on_ipsec_loss"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.wifi.flags/Android.bp b/aconfig/ap4a/android.net.wifi.flags/Android.bp
new file mode 100644
index 0000000..0809f26
--- /dev/null
+++ b/aconfig/ap4a/android.net.wifi.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-platform_build_release-ap4a-android.net.wifi.flags-all",
+  package: "android.net.wifi.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto b/aconfig/ap4a/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto
new file mode 100644
index 0000000..d3e542c
--- /dev/null
+++ b/aconfig/ap4a/android.net.wifi.flags/get_device_cross_akm_roaming_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.wifi.flags"
+  name: "get_device_cross_akm_roaming_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto b/aconfig/ap4a/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
new file mode 100644
index 0000000..e354937
--- /dev/null
+++ b/aconfig/ap4a/android.net.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.wifi.flags"
+  name: "network_provider_battery_charging_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/Android.bp b/aconfig/ap4a/android.nfc/Android.bp
new file mode 100644
index 0000000..967828f
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/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-platform_build_release-ap4a-android.nfc-all",
+  package: "android.nfc",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.nfc/enable_nfc_mainline_flag_values.textproto b/aconfig/ap4a/android.nfc/enable_nfc_mainline_flag_values.textproto
new file mode 100644
index 0000000..85eb673
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/enable_nfc_mainline_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "enable_nfc_mainline"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/enable_nfc_reader_option_flag_values.textproto b/aconfig/ap4a/android.nfc/enable_nfc_reader_option_flag_values.textproto
new file mode 100644
index 0000000..70f4ad5
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/enable_nfc_reader_option_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "enable_nfc_reader_option"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto b/aconfig/ap4a/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto
new file mode 100644
index 0000000..a213c29
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/enable_nfc_set_discovery_tech_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "enable_nfc_set_discovery_tech"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/enable_nfc_user_restriction_flag_values.textproto b/aconfig/ap4a/android.nfc/enable_nfc_user_restriction_flag_values.textproto
new file mode 100644
index 0000000..a7843b6
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/enable_nfc_user_restriction_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "enable_nfc_user_restriction"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/nfc_observe_mode_flag_values.textproto b/aconfig/ap4a/android.nfc/nfc_observe_mode_flag_values.textproto
new file mode 100644
index 0000000..77a9fd6
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/nfc_observe_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_observe_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto b/aconfig/ap4a/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto
new file mode 100644
index 0000000..1900a81
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/nfc_observe_mode_st_shim_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_observe_mode_st_shim"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/nfc_read_polling_loop_flag_values.textproto b/aconfig/ap4a/android.nfc/nfc_read_polling_loop_flag_values.textproto
new file mode 100644
index 0000000..78ece48
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/nfc_read_polling_loop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_read_polling_loop"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto b/aconfig/ap4a/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto
new file mode 100644
index 0000000..2ac801e
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/nfc_read_polling_loop_st_shim_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_read_polling_loop_st_shim"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.nfc/nfc_vendor_cmd_flag_values.textproto b/aconfig/ap4a/android.nfc/nfc_vendor_cmd_flag_values.textproto
new file mode 100644
index 0000000..760a139
--- /dev/null
+++ b/aconfig/ap4a/android.nfc/nfc_vendor_cmd_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_vendor_cmd"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.profiling/Android.bp b/aconfig/ap4a/android.os.profiling/Android.bp
new file mode 100644
index 0000000..df12067
--- /dev/null
+++ b/aconfig/ap4a/android.os.profiling/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-platform_build_release-ap4a-android.os.profiling-all",
+  package: "android.os.profiling",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.os.profiling/redaction_enabled_flag_values.textproto b/aconfig/ap4a/android.os.profiling/redaction_enabled_flag_values.textproto
new file mode 100644
index 0000000..3a9e00d
--- /dev/null
+++ b/aconfig/ap4a/android.os.profiling/redaction_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.profiling"
+  name: "redaction_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.profiling/telemetry_apis_flag_values.textproto b/aconfig/ap4a/android.os.profiling/telemetry_apis_flag_values.textproto
new file mode 100644
index 0000000..0ac6785
--- /dev/null
+++ b/aconfig/ap4a/android.os.profiling/telemetry_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.profiling"
+  name: "telemetry_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.vibrator/Android.bp b/aconfig/ap4a/android.os.vibrator/Android.bp
new file mode 100644
index 0000000..b9650a8
--- /dev/null
+++ b/aconfig/ap4a/android.os.vibrator/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-platform_build_release-ap4a-android.os.vibrator-all",
+  package: "android.os.vibrator",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto b/aconfig/ap4a/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto
new file mode 100644
index 0000000..741dd79
--- /dev/null
+++ b/aconfig/ap4a/android.os.vibrator/adaptive_haptics_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "adaptive_haptics_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.vibrator/cancel_by_appops_flag_values.textproto b/aconfig/ap4a/android.os.vibrator/cancel_by_appops_flag_values.textproto
new file mode 100644
index 0000000..f168ce3
--- /dev/null
+++ b/aconfig/ap4a/android.os.vibrator/cancel_by_appops_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "cancel_by_appops"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto b/aconfig/ap4a/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto
new file mode 100644
index 0000000..07b2454
--- /dev/null
+++ b/aconfig/ap4a/android.os.vibrator/haptic_feedback_vibration_oem_customization_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "haptic_feedback_vibration_oem_customization_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto b/aconfig/ap4a/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
new file mode 100644
index 0000000..b3c9584
--- /dev/null
+++ b/aconfig/ap4a/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "throttle_vibration_params_requests"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/Android.bp b/aconfig/ap4a/android.os/Android.bp
new file mode 100644
index 0000000..5a9371e
--- /dev/null
+++ b/aconfig/ap4a/android.os/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-platform_build_release-ap4a-android.os-all",
+  package: "android.os",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto b/aconfig/ap4a/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto
new file mode 100644
index 0000000..c495c75
--- /dev/null
+++ b/aconfig/ap4a/android.os/adpf_gpu_report_actual_work_duration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "adpf_gpu_report_actual_work_duration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/adpf_measure_during_input_event_boost_flag_values.textproto b/aconfig/ap4a/android.os/adpf_measure_during_input_event_boost_flag_values.textproto
new file mode 100644
index 0000000..da735b1
--- /dev/null
+++ b/aconfig/ap4a/android.os/adpf_measure_during_input_event_boost_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "adpf_measure_during_input_event_boost"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/adpf_prefer_power_efficiency_flag_values.textproto b/aconfig/ap4a/android.os/adpf_prefer_power_efficiency_flag_values.textproto
new file mode 100644
index 0000000..e3c7829
--- /dev/null
+++ b/aconfig/ap4a/android.os/adpf_prefer_power_efficiency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "adpf_prefer_power_efficiency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/adpf_use_fmq_channel_flag_values.textproto b/aconfig/ap4a/android.os/adpf_use_fmq_channel_flag_values.textproto
new file mode 100644
index 0000000..ab005a3
--- /dev/null
+++ b/aconfig/ap4a/android.os/adpf_use_fmq_channel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "adpf_use_fmq_channel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/allow_private_profile_flag_values.textproto b/aconfig/ap4a/android.os/allow_private_profile_flag_values.textproto
new file mode 100644
index 0000000..9097791
--- /dev/null
+++ b/aconfig/ap4a/android.os/allow_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "allow_private_profile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/allow_thermal_headroom_thresholds_flag_values.textproto b/aconfig/ap4a/android.os/allow_thermal_headroom_thresholds_flag_values.textproto
new file mode 100644
index 0000000..d2b7357
--- /dev/null
+++ b/aconfig/ap4a/android.os/allow_thermal_headroom_thresholds_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "allow_thermal_headroom_thresholds"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/battery_part_status_api_flag_values.textproto b/aconfig/ap4a/android.os/battery_part_status_api_flag_values.textproto
new file mode 100644
index 0000000..24d6110
--- /dev/null
+++ b/aconfig/ap4a/android.os/battery_part_status_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "battery_part_status_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/message_queue_tail_tracking_flag_values.textproto b/aconfig/ap4a/android.os/message_queue_tail_tracking_flag_values.textproto
new file mode 100644
index 0000000..74ba36d
--- /dev/null
+++ b/aconfig/ap4a/android.os/message_queue_tail_tracking_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "message_queue_tail_tracking"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/remove_app_profiler_pss_collection_flag_values.textproto b/aconfig/ap4a/android.os/remove_app_profiler_pss_collection_flag_values.textproto
new file mode 100644
index 0000000..0ce59aa
--- /dev/null
+++ b/aconfig/ap4a/android.os/remove_app_profiler_pss_collection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "remove_app_profiler_pss_collection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/security_state_service_flag_values.textproto b/aconfig/ap4a/android.os/security_state_service_flag_values.textproto
new file mode 100644
index 0000000..c3a53a5
--- /dev/null
+++ b/aconfig/ap4a/android.os/security_state_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "security_state_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/storage_lifetime_api_flag_values.textproto b/aconfig/ap4a/android.os/storage_lifetime_api_flag_values.textproto
new file mode 100644
index 0000000..9dca99a
--- /dev/null
+++ b/aconfig/ap4a/android.os/storage_lifetime_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "storage_lifetime_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.os/telemetry_apis_framework_initialization_flag_values.textproto b/aconfig/ap4a/android.os/telemetry_apis_framework_initialization_flag_values.textproto
new file mode 100644
index 0000000..b923e34
--- /dev/null
+++ b/aconfig/ap4a/android.os/telemetry_apis_framework_initialization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "telemetry_apis_framework_initialization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/Android.bp b/aconfig/ap4a/android.permission.flags/Android.bp
new file mode 100644
index 0000000..d288ae6
--- /dev/null
+++ b/aconfig/ap4a/android.permission.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-platform_build_release-ap4a-android.permission.flags-all",
+  package: "android.permission.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto
new file mode 100644
index 0000000..b11f3df
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/apex_signature_permission_allowlist_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "apex_signature_permission_allowlist_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto
new file mode 100644
index 0000000..85f984f
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/device_aware_permission_apis_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "device_aware_permission_apis_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto
new file mode 100644
index 0000000..cd7276e
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/device_aware_permissions_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "device_aware_permissions_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto b/aconfig/ap4a/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
new file mode 100644
index 0000000..2a72f61
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "dont_remove_existing_uid_states"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto
new file mode 100644
index 0000000..c3d5a4a
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/enhanced_confirmation_mode_apis_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "enhanced_confirmation_mode_apis_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto b/aconfig/ap4a/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto
new file mode 100644
index 0000000..b1be3f7
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/factory_reset_prep_permission_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "factory_reset_prep_permission_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto b/aconfig/ap4a/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto
new file mode 100644
index 0000000..bbeb429
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/finish_running_ops_for_killed_packages_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "finish_running_ops_for_killed_packages"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..e5802cb
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/get_emergency_role_holder_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "get_emergency_role_holder_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
new file mode 100644
index 0000000..4b6964f
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "location_bypass_privacy_dashboard_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto b/aconfig/ap4a/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto
new file mode 100644
index 0000000..c3b850f
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/op_enable_mobile_data_by_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "op_enable_mobile_data_by_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/retail_demo_role_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/retail_demo_role_enabled_flag_values.textproto
new file mode 100644
index 0000000..4b6e5fb
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/retail_demo_role_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "retail_demo_role_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto
new file mode 100644
index 0000000..8321714
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/runtime_permission_appops_mapping_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "runtime_permission_appops_mapping_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/sensitive_content_improvements_flag_values.textproto b/aconfig/ap4a/android.permission.flags/sensitive_content_improvements_flag_values.textproto
new file mode 100644
index 0000000..c88be81
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/sensitive_content_improvements_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "sensitive_content_improvements"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto b/aconfig/ap4a/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto
new file mode 100644
index 0000000..bc5cd6a
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/sensitive_content_metrics_bugfix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "sensitive_content_metrics_bugfix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto b/aconfig/ap4a/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto
new file mode 100644
index 0000000..dea1f11
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/sensitive_content_recents_screenshot_bugfix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "sensitive_content_recents_screenshot_bugfix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto b/aconfig/ap4a/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto
new file mode 100644
index 0000000..1bfcdfb
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/sensitive_notification_app_protection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "sensitive_notification_app_protection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/server_side_attribution_registration_flag_values.textproto b/aconfig/ap4a/android.permission.flags/server_side_attribution_registration_flag_values.textproto
new file mode 100644
index 0000000..e2838c9
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/server_side_attribution_registration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "server_side_attribution_registration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/should_register_attribution_source_flag_values.textproto b/aconfig/ap4a/android.permission.flags/should_register_attribution_source_flag_values.textproto
new file mode 100644
index 0000000..d1666ba
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/should_register_attribution_source_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "should_register_attribution_source"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto
new file mode 100644
index 0000000..87fda09
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/signature_permission_allowlist_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "signature_permission_allowlist_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto
new file mode 100644
index 0000000..19a882e
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/system_server_role_controller_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "system_server_role_controller_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.permission.flags/wallet_role_enabled_flag_values.textproto b/aconfig/ap4a/android.permission.flags/wallet_role_enabled_flag_values.textproto
new file mode 100644
index 0000000..3a0d808
--- /dev/null
+++ b/aconfig/ap4a/android.permission.flags/wallet_role_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "wallet_role_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.provider/Android.bp b/aconfig/ap4a/android.provider/Android.bp
new file mode 100644
index 0000000..5b58b2c
--- /dev/null
+++ b/aconfig/ap4a/android.provider/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-platform_build_release-ap4a-android.provider-all",
+  package: "android.provider",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto b/aconfig/ap4a/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
new file mode 100644
index 0000000..01b27db
--- /dev/null
+++ b/aconfig/ap4a/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider"
+  name: "reduce_binder_transaction_size_for_get_all_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.provider/system_settings_default_flag_values.textproto b/aconfig/ap4a/android.provider/system_settings_default_flag_values.textproto
new file mode 100644
index 0000000..349d66f
--- /dev/null
+++ b/aconfig/ap4a/android.provider/system_settings_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider"
+  name: "system_settings_default"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.provider/user_keys_flag_values.textproto b/aconfig/ap4a/android.provider/user_keys_flag_values.textproto
new file mode 100644
index 0000000..7a5d6ce
--- /dev/null
+++ b/aconfig/ap4a/android.provider/user_keys_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider"
+  name: "user_keys"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security.flag/Android.bp b/aconfig/ap4a/android.security.flag/Android.bp
new file mode 100644
index 0000000..a65d346
--- /dev/null
+++ b/aconfig/ap4a/android.security.flag/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-platform_build_release-ap4a-android.security.flag-all",
+  package: "android.security.flag",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.security.flag/deprecate_fsverity_init_flag_values.textproto b/aconfig/ap4a/android.security.flag/deprecate_fsverity_init_flag_values.textproto
new file mode 100644
index 0000000..42f3e47
--- /dev/null
+++ b/aconfig/ap4a/android.security.flag/deprecate_fsverity_init_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security.flag"
+  name: "deprecate_fsverity_init"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/Android.bp b/aconfig/ap4a/android.security/Android.bp
new file mode 100644
index 0000000..cc16dc0
--- /dev/null
+++ b/aconfig/ap4a/android.security/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-platform_build_release-ap4a-android.security-all",
+  package: "android.security",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.security/asm_restrictions_enabled_flag_values.textproto b/aconfig/ap4a/android.security/asm_restrictions_enabled_flag_values.textproto
new file mode 100644
index 0000000..ee9436e
--- /dev/null
+++ b/aconfig/ap4a/android.security/asm_restrictions_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "asm_restrictions_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/binary_transparency_sepolicy_hash_flag_values.textproto b/aconfig/ap4a/android.security/binary_transparency_sepolicy_hash_flag_values.textproto
new file mode 100644
index 0000000..a541f32
--- /dev/null
+++ b/aconfig/ap4a/android.security/binary_transparency_sepolicy_hash_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "binary_transparency_sepolicy_hash"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/content_uri_permission_apis_flag_values.textproto b/aconfig/ap4a/android.security/content_uri_permission_apis_flag_values.textproto
new file mode 100644
index 0000000..8d00902
--- /dev/null
+++ b/aconfig/ap4a/android.security/content_uri_permission_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "content_uri_permission_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/deprecate_fsv_sig_flag_values.textproto b/aconfig/ap4a/android.security/deprecate_fsv_sig_flag_values.textproto
new file mode 100644
index 0000000..50c7743
--- /dev/null
+++ b/aconfig/ap4a/android.security/deprecate_fsv_sig_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "deprecate_fsv_sig"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/dump_attestation_verifications_flag_values.textproto b/aconfig/ap4a/android.security/dump_attestation_verifications_flag_values.textproto
new file mode 100644
index 0000000..e944c43
--- /dev/null
+++ b/aconfig/ap4a/android.security/dump_attestation_verifications_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "dump_attestation_verifications"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/enforce_intent_filter_match_flag_values.textproto b/aconfig/ap4a/android.security/enforce_intent_filter_match_flag_values.textproto
new file mode 100644
index 0000000..a3f2bb8
--- /dev/null
+++ b/aconfig/ap4a/android.security/enforce_intent_filter_match_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "enforce_intent_filter_match"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/extend_ecm_to_all_settings_flag_values.textproto b/aconfig/ap4a/android.security/extend_ecm_to_all_settings_flag_values.textproto
new file mode 100644
index 0000000..91e04e4
--- /dev/null
+++ b/aconfig/ap4a/android.security/extend_ecm_to_all_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "extend_ecm_to_all_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto b/aconfig/ap4a/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto
new file mode 100644
index 0000000..ce4cea5
--- /dev/null
+++ b/aconfig/ap4a/android.security/extend_vb_chain_to_updated_apk_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "extend_vb_chain_to_updated_apk"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/frp_enforcement_flag_values.textproto b/aconfig/ap4a/android.security/frp_enforcement_flag_values.textproto
new file mode 100644
index 0000000..f80665c
--- /dev/null
+++ b/aconfig/ap4a/android.security/frp_enforcement_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "frp_enforcement"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/fsverity_api_flag_values.textproto b/aconfig/ap4a/android.security/fsverity_api_flag_values.textproto
new file mode 100644
index 0000000..5aaa964
--- /dev/null
+++ b/aconfig/ap4a/android.security/fsverity_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "fsverity_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/mgf1_digest_setter_v2_flag_values.textproto b/aconfig/ap4a/android.security/mgf1_digest_setter_v2_flag_values.textproto
new file mode 100644
index 0000000..85ccfab
--- /dev/null
+++ b/aconfig/ap4a/android.security/mgf1_digest_setter_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "mgf1_digest_setter_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/report_primary_auth_attempts_flag_values.textproto b/aconfig/ap4a/android.security/report_primary_auth_attempts_flag_values.textproto
new file mode 100644
index 0000000..58c6ddf
--- /dev/null
+++ b/aconfig/ap4a/android.security/report_primary_auth_attempts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "report_primary_auth_attempts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.security/significant_places_flag_values.textproto b/aconfig/ap4a/android.security/significant_places_flag_values.textproto
new file mode 100644
index 0000000..b807069
--- /dev/null
+++ b/aconfig/ap4a/android.security/significant_places_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security"
+  name: "significant_places"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server.app/Android.bp b/aconfig/ap4a/android.server.app/Android.bp
new file mode 100644
index 0000000..3ab706c
--- /dev/null
+++ b/aconfig/ap4a/android.server.app/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-platform_build_release-ap4a-android.server.app-all",
+  package: "android.server.app",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.server.app/disable_game_mode_when_app_top_flag_values.textproto b/aconfig/ap4a/android.server.app/disable_game_mode_when_app_top_flag_values.textproto
new file mode 100644
index 0000000..1a55bff
--- /dev/null
+++ b/aconfig/ap4a/android.server.app/disable_game_mode_when_app_top_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server.app"
+  name: "disable_game_mode_when_app_top"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server.app/game_default_frame_rate_flag_values.textproto b/aconfig/ap4a/android.server.app/game_default_frame_rate_flag_values.textproto
new file mode 100644
index 0000000..6235738
--- /dev/null
+++ b/aconfig/ap4a/android.server.app/game_default_frame_rate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server.app"
+  name: "game_default_frame_rate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server/Android.bp b/aconfig/ap4a/android.server/Android.bp
new file mode 100644
index 0000000..3ddd4cb
--- /dev/null
+++ b/aconfig/ap4a/android.server/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-platform_build_release-ap4a-android.server-all",
+  package: "android.server",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.server/allow_removing_vpn_service_flag_values.textproto b/aconfig/ap4a/android.server/allow_removing_vpn_service_flag_values.textproto
new file mode 100644
index 0000000..f69dcb8
--- /dev/null
+++ b/aconfig/ap4a/android.server/allow_removing_vpn_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "allow_removing_vpn_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server/remove_text_service_flag_values.textproto b/aconfig/ap4a/android.server/remove_text_service_flag_values.textproto
new file mode 100644
index 0000000..cdcf22e
--- /dev/null
+++ b/aconfig/ap4a/android.server/remove_text_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "remove_text_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto b/aconfig/ap4a/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
new file mode 100644
index 0000000..71ba16e
--- /dev/null
+++ b/aconfig/ap4a/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "remove_wearable_sensing_service_from_wear"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.server/telemetry_apis_service_flag_values.textproto b/aconfig/ap4a/android.server/telemetry_apis_service_flag_values.textproto
new file mode 100644
index 0000000..f54856a
--- /dev/null
+++ b/aconfig/ap4a/android.server/telemetry_apis_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "telemetry_apis_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.autofill/Android.bp b/aconfig/ap4a/android.service.autofill/Android.bp
new file mode 100644
index 0000000..b48538c
--- /dev/null
+++ b/aconfig/ap4a/android.service.autofill/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-platform_build_release-ap4a-android.service.autofill-all",
+  package: "android.service.autofill",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto b/aconfig/ap4a/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto
new file mode 100644
index 0000000..fc791b6
--- /dev/null
+++ b/aconfig/ap4a/android.service.autofill/autofill_credman_dev_integration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.autofill"
+  name: "autofill_credman_dev_integration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.autofill/autofill_credman_integration_flag_values.textproto b/aconfig/ap4a/android.service.autofill/autofill_credman_integration_flag_values.textproto
new file mode 100644
index 0000000..22ab6bf
--- /dev/null
+++ b/aconfig/ap4a/android.service.autofill/autofill_credman_integration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.autofill"
+  name: "autofill_credman_integration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto b/aconfig/ap4a/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto
new file mode 100644
index 0000000..bf3644a
--- /dev/null
+++ b/aconfig/ap4a/android.service.autofill/remote_fill_service_use_weak_reference_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.autofill"
+  name: "remote_fill_service_use_weak_reference"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.chooser/Android.bp b/aconfig/ap4a/android.service.chooser/Android.bp
new file mode 100644
index 0000000..9c214d2
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/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-platform_build_release-ap4a-android.service.chooser-all",
+  package: "android.service.chooser",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.chooser/chooser_album_text_flag_values.textproto b/aconfig/ap4a/android.service.chooser/chooser_album_text_flag_values.textproto
new file mode 100644
index 0000000..a3511b4
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/chooser_album_text_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "chooser_album_text"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.chooser/chooser_payload_toggling_flag_values.textproto b/aconfig/ap4a/android.service.chooser/chooser_payload_toggling_flag_values.textproto
new file mode 100644
index 0000000..5bad0b4
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/chooser_payload_toggling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "chooser_payload_toggling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.chooser/enable_chooser_result_flag_values.textproto b/aconfig/ap4a/android.service.chooser/enable_chooser_result_flag_values.textproto
new file mode 100644
index 0000000..135a727
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/enable_chooser_result_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "enable_chooser_result"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto b/aconfig/ap4a/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto
new file mode 100644
index 0000000..fb86f75
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/enable_sharesheet_metadata_extra_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "enable_sharesheet_metadata_extra"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto b/aconfig/ap4a/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
new file mode 100644
index 0000000..d3d3315
--- /dev/null
+++ b/aconfig/ap4a/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "fix_resolver_memory_leak"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.controls.flags/Android.bp b/aconfig/ap4a/android.service.controls.flags/Android.bp
new file mode 100644
index 0000000..6a71d9d
--- /dev/null
+++ b/aconfig/ap4a/android.service.controls.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-platform_build_release-ap4a-android.service.controls.flags-all",
+  package: "android.service.controls.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.controls.flags/home_panel_dream_flag_values.textproto b/aconfig/ap4a/android.service.controls.flags/home_panel_dream_flag_values.textproto
new file mode 100644
index 0000000..4d0d837
--- /dev/null
+++ b/aconfig/ap4a/android.service.controls.flags/home_panel_dream_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.controls.flags"
+  name: "home_panel_dream"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.dreams/Android.bp b/aconfig/ap4a/android.service.dreams/Android.bp
new file mode 100644
index 0000000..19f251a
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/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-platform_build_release-ap4a-android.service.dreams-all",
+  package: "android.service.dreams",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto b/aconfig/ap4a/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto
new file mode 100644
index 0000000..a1dad28
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/dismiss_dream_on_keyguard_dismiss_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "dismiss_dream_on_keyguard_dismiss"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.dreams/dream_handles_being_obscured_flag_values.textproto b/aconfig/ap4a/android.service.dreams/dream_handles_being_obscured_flag_values.textproto
new file mode 100644
index 0000000..5a061b9
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/dream_handles_being_obscured_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "dream_handles_being_obscured"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto b/aconfig/ap4a/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto
new file mode 100644
index 0000000..2f25efc
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/dream_handles_confirm_keys_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "dream_handles_confirm_keys"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.dreams/dream_wake_redirect_flag_values.textproto b/aconfig/ap4a/android.service.dreams/dream_wake_redirect_flag_values.textproto
new file mode 100644
index 0000000..42a210a
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/dream_wake_redirect_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "dream_wake_redirect"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto b/aconfig/ap4a/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
new file mode 100644
index 0000000..69c17fe
--- /dev/null
+++ b/aconfig/ap4a/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "start_and_stop_dozing_in_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.notification/Android.bp b/aconfig/ap4a/android.service.notification/Android.bp
new file mode 100644
index 0000000..d7fa7fb
--- /dev/null
+++ b/aconfig/ap4a/android.service.notification/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-platform_build_release-ap4a-android.service.notification-all",
+  package: "android.service.notification",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.notification/callstyle_callback_api_flag_values.textproto b/aconfig/ap4a/android.service.notification/callstyle_callback_api_flag_values.textproto
new file mode 100644
index 0000000..570fff2
--- /dev/null
+++ b/aconfig/ap4a/android.service.notification/callstyle_callback_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.notification"
+  name: "callstyle_callback_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.notification/ranking_update_ashmem_flag_values.textproto b/aconfig/ap4a/android.service.notification/ranking_update_ashmem_flag_values.textproto
new file mode 100644
index 0000000..6ea1aef
--- /dev/null
+++ b/aconfig/ap4a/android.service.notification/ranking_update_ashmem_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.notification"
+  name: "ranking_update_ashmem"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto b/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto
new file mode 100644
index 0000000..b2bc110
--- /dev/null
+++ b/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_big_text_style_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.notification"
+  name: "redact_sensitive_notifications_big_text_style"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto b/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto
new file mode 100644
index 0000000..2545627
--- /dev/null
+++ b/aconfig/ap4a/android.service.notification/redact_sensitive_notifications_from_untrusted_listeners_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.notification"
+  name: "redact_sensitive_notifications_from_untrusted_listeners"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.voice.flags/Android.bp b/aconfig/ap4a/android.service.voice.flags/Android.bp
new file mode 100644
index 0000000..fa16c63
--- /dev/null
+++ b/aconfig/ap4a/android.service.voice.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-platform_build_release-ap4a-android.service.voice.flags-all",
+  package: "android.service.voice.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto b/aconfig/ap4a/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto
new file mode 100644
index 0000000..e64e9bd
--- /dev/null
+++ b/aconfig/ap4a/android.service.voice.flags/allow_foreground_activities_in_on_show_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.voice.flags"
+  name: "allow_foreground_activities_in_on_show"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto b/aconfig/ap4a/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto
new file mode 100644
index 0000000..096d0db
--- /dev/null
+++ b/aconfig/ap4a/android.service.voice.flags/allow_hotword_bump_egress_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.voice.flags"
+  name: "allow_hotword_bump_egress"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.speech.flags/Android.bp b/aconfig/ap4a/android.speech.flags/Android.bp
new file mode 100644
index 0000000..cabeb89
--- /dev/null
+++ b/aconfig/ap4a/android.speech.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-platform_build_release-ap4a-android.speech.flags-all",
+  package: "android.speech.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.speech.flags/multilang_extra_launch_flag_values.textproto b/aconfig/ap4a/android.speech.flags/multilang_extra_launch_flag_values.textproto
new file mode 100644
index 0000000..b3bd965
--- /dev/null
+++ b/aconfig/ap4a/android.speech.flags/multilang_extra_launch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.speech.flags"
+  name: "multilang_extra_launch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/Android.bp b/aconfig/ap4a/android.view.accessibility/Android.bp
new file mode 100644
index 0000000..d7a4b4f
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/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-platform_build_release-ap4a-android.view.accessibility-all",
+  package: "android.view.accessibility",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto
new file mode 100644
index 0000000..f72935b
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/a11y_qs_shortcut_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "a11y_qs_shortcut"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/braille_display_hid_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/braille_display_hid_flag_values.textproto
new file mode 100644
index 0000000..e58f429
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/braille_display_hid_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "braille_display_hid"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/collection_info_item_counts_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/collection_info_item_counts_flag_values.textproto
new file mode 100644
index 0000000..9a116c9
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/collection_info_item_counts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "collection_info_item_counts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto
new file mode 100644
index 0000000..f005f66
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/fix_merged_content_change_event_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "fix_merged_content_change_event_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/flash_notification_system_api_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/flash_notification_system_api_flag_values.textproto
new file mode 100644
index 0000000..61ee959
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/flash_notification_system_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "flash_notification_system_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/granular_scrolling_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/granular_scrolling_flag_values.textproto
new file mode 100644
index 0000000..55a6520
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/granular_scrolling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "granular_scrolling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto
new file mode 100644
index 0000000..efea57a
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/migrate_enable_shortcuts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "migrate_enable_shortcuts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/motion_event_observing_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/motion_event_observing_flag_values.textproto
new file mode 100644
index 0000000..aeb2fa3
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/motion_event_observing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "motion_event_observing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto
new file mode 100644
index 0000000..e8c84bd
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/restore_a11y_shortcut_target_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "restore_a11y_shortcut_target_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto b/aconfig/ap4a/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto
new file mode 100644
index 0000000..bd3d6f0
--- /dev/null
+++ b/aconfig/ap4a/android.view.accessibility/skip_accessibility_warning_dialog_for_trusted_services_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "skip_accessibility_warning_dialog_for_trusted_services"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.contentcapture.flags/Android.bp b/aconfig/ap4a/android.view.contentcapture.flags/Android.bp
new file mode 100644
index 0000000..8229a14
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentcapture.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-platform_build_release-ap4a-android.view.contentcapture.flags-all",
+  package: "android.view.contentcapture.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto
new file mode 100644
index 0000000..897376c
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentcapture.flags/run_on_background_thread_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentcapture.flags"
+  name: "run_on_background_thread_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.contentprotection.flags/Android.bp b/aconfig/ap4a/android.view.contentprotection.flags/Android.bp
new file mode 100644
index 0000000..29e6d2d
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentprotection.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-platform_build_release-ap4a-android.view.contentprotection.flags-all",
+  package: "android.view.contentprotection.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/blocklist_update_enabled_flag_values.textproto
new file mode 100644
index 0000000..62895e0
--- /dev/null
+++ b/aconfig/ap4a/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/ap4a/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto
new file mode 100644
index 0000000..77316a4
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentprotection.flags/create_accessibility_overlay_app_op_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "create_accessibility_overlay_app_op_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto
new file mode 100644
index 0000000..371d7b1
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentprotection.flags/manage_device_policy_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "manage_device_policy_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/parse_groups_config_enabled_flag_values.textproto
new file mode 100644
index 0000000..4db8f5f
--- /dev/null
+++ b/aconfig/ap4a/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/ap4a/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto
new file mode 100644
index 0000000..f1fd822
--- /dev/null
+++ b/aconfig/ap4a/android.view.contentprotection.flags/rapid_clear_notifications_by_listener_app_op_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.contentprotection.flags"
+  name: "rapid_clear_notifications_by_listener_app_op_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto b/aconfig/ap4a/android.view.contentprotection.flags/setting_ui_enabled_flag_values.textproto
new file mode 100644
index 0000000..e855d79
--- /dev/null
+++ b/aconfig/ap4a/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/ap4a/android.view.flags/Android.bp b/aconfig/ap4a/android.view.flags/Android.bp
new file mode 100644
index 0000000..53b34c4
--- /dev/null
+++ b/aconfig/ap4a/android.view.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-platform_build_release-ap4a-android.view.flags-all",
+  package: "android.view.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto b/aconfig/ap4a/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto
new file mode 100644
index 0000000..bd218a4
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/add_schandle_to_vri_surface_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "add_schandle_to_vri_surface"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/customizable_window_headers_flag_values.textproto b/aconfig/ap4a/android.view.flags/customizable_window_headers_flag_values.textproto
new file mode 100644
index 0000000..ab4b359
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/customizable_window_headers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "customizable_window_headers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/disable_draw_wake_lock_flag_values.textproto b/aconfig/ap4a/android.view.flags/disable_draw_wake_lock_flag_values.textproto
new file mode 100644
index 0000000..a27444d
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/disable_draw_wake_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "disable_draw_wake_lock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto b/aconfig/ap4a/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto
new file mode 100644
index 0000000..dfaf2c0
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/enable_arrow_icon_on_hover_when_clickable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "enable_arrow_icon_on_hover_when_clickable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto b/aconfig/ap4a/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto
new file mode 100644
index 0000000..7398211
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/enable_surface_native_alloc_registration_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "enable_surface_native_alloc_registration_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto b/aconfig/ap4a/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
new file mode 100644
index 0000000..6d5efde
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "enable_vector_cursor_a11y_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/enable_vector_cursors_flag_values.textproto b/aconfig/ap4a/android.view.flags/enable_vector_cursors_flag_values.textproto
new file mode 100644
index 0000000..2d69e39
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/enable_vector_cursors_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "enable_vector_cursors"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/scroll_feedback_api_flag_values.textproto b/aconfig/ap4a/android.view.flags/scroll_feedback_api_flag_values.textproto
new file mode 100644
index 0000000..e5c9fc1
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/scroll_feedback_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "scroll_feedback_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto b/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto
new file mode 100644
index 0000000..5306c41
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "sensitive_content_app_protection_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_flag_values.textproto b/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_flag_values.textproto
new file mode 100644
index 0000000..dcdce43
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/sensitive_content_app_protection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "sensitive_content_app_protection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto b/aconfig/ap4a/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto
new file mode 100644
index 0000000..77b6b89
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/sensitive_content_premature_protection_removed_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "sensitive_content_premature_protection_removed_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto
new file mode 100644
index 0000000..09ed6a7
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_default_normal_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_default_normal_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto
new file mode 100644
index 0000000..6dbbd11
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_function_enabling_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_function_enabling_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto
new file mode 100644
index 0000000..d34a581
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_small_uses_percent_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_small_uses_percent_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto
new file mode 100644
index 0000000..972170a
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_typing_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_typing_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto
new file mode 100644
index 0000000..dbe6f50
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_velocity_mapping_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_velocity_mapping_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto
new file mode 100644
index 0000000..572c7b0
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_frame_rate_view_enabling_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_frame_rate_view_enabling_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto b/aconfig/ap4a/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto
new file mode 100644
index 0000000..72b10bc
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/toolkit_set_frame_rate_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "toolkit_set_frame_rate_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto b/aconfig/ap4a/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto
new file mode 100644
index 0000000..5d86353
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/use_view_based_rotary_encoder_scroll_haptics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "use_view_based_rotary_encoder_scroll_haptics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.flags/view_velocity_api_flag_values.textproto b/aconfig/ap4a/android.view.flags/view_velocity_api_flag_values.textproto
new file mode 100644
index 0000000..6f6fd43
--- /dev/null
+++ b/aconfig/ap4a/android.view.flags/view_velocity_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "view_velocity_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/Android.bp b/aconfig/ap4a/android.view.inputmethod/Android.bp
new file mode 100644
index 0000000..1f9520e
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/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-platform_build_release-ap4a-android.view.inputmethod-all",
+  package: "android.view.inputmethod",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/concurrent_input_methods_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/concurrent_input_methods_flag_values.textproto
new file mode 100644
index 0000000..3879f7f
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/concurrent_input_methods_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "concurrent_input_methods"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/connectionless_handwriting_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/connectionless_handwriting_flag_values.textproto
new file mode 100644
index 0000000..37e5a7b
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/connectionless_handwriting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "connectionless_handwriting"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto
new file mode 100644
index 0000000..fdd8707
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/defer_show_soft_input_until_session_creation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "defer_show_soft_input_until_session_creation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto
new file mode 100644
index 0000000..ff17888
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/editorinfo_handwriting_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "editorinfo_handwriting_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto
new file mode 100644
index 0000000..95f27ac
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/home_screen_handwriting_delegator_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "home_screen_handwriting_delegator"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto
new file mode 100644
index 0000000..b98792f
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/ime_switcher_revamp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "ime_switcher_revamp"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto
new file mode 100644
index 0000000..dfdec79
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/initiation_without_input_connection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "initiation_without_input_connection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/predictive_back_ime_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/predictive_back_ime_flag_values.textproto
new file mode 100644
index 0000000..6b1acff
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/predictive_back_ime_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "predictive_back_ime"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto
new file mode 100644
index 0000000..2be8bb5
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/use_handwriting_listener_for_tooltype_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "use_handwriting_listener_for_tooltype"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto
new file mode 100644
index 0000000..6b7064e
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/use_input_method_info_safe_list_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "use_input_method_info_safe_list"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto b/aconfig/ap4a/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto
new file mode 100644
index 0000000..81836b8
--- /dev/null
+++ b/aconfig/ap4a/android.view.inputmethod/use_zero_jank_proxy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "use_zero_jank_proxy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.webkit/Android.bp b/aconfig/ap4a/android.webkit/Android.bp
new file mode 100644
index 0000000..c1958f9
--- /dev/null
+++ b/aconfig/ap4a/android.webkit/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-platform_build_release-ap4a-android.webkit-all",
+  package: "android.webkit",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.webkit/update_service_v2_flag_values.textproto b/aconfig/ap4a/android.webkit/update_service_v2_flag_values.textproto
new file mode 100644
index 0000000..088c0f9
--- /dev/null
+++ b/aconfig/ap4a/android.webkit/update_service_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.webkit"
+  name: "update_service_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/Android.bp b/aconfig/ap4a/android.widget.flags/Android.bp
new file mode 100644
index 0000000..d05ebbf
--- /dev/null
+++ b/aconfig/ap4a/android.widget.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-platform_build_release-ap4a-android.widget.flags-all",
+  package: "android.widget.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto b/aconfig/ap4a/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto
new file mode 100644
index 0000000..2319126
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/big_picture_style_discard_empty_icon_bitmap_drawables_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "big_picture_style_discard_empty_icon_bitmap_drawables"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/call_style_set_data_async_flag_values.textproto b/aconfig/ap4a/android.widget.flags/call_style_set_data_async_flag_values.textproto
new file mode 100644
index 0000000..fa7536a
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/call_style_set_data_async_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "call_style_set_data_async"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto b/aconfig/ap4a/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
new file mode 100644
index 0000000..cc3502e
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "conversation_layout_use_maximum_child_height"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto b/aconfig/ap4a/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto
new file mode 100644
index 0000000..70813ba
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/conversation_style_set_avatar_async_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "conversation_style_set_avatar_async"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto b/aconfig/ap4a/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto
new file mode 100644
index 0000000..5f6fd09
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/enable_platform_widget_differential_motion_fling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "enable_platform_widget_differential_motion_fling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/messaging_child_request_layout_flag_values.textproto b/aconfig/ap4a/android.widget.flags/messaging_child_request_layout_flag_values.textproto
new file mode 100644
index 0000000..651fd64
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/messaging_child_request_layout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "messaging_child_request_layout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto b/aconfig/ap4a/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto
new file mode 100644
index 0000000..4786314
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/notif_linearlayout_optimized_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "notif_linearlayout_optimized"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/android.widget.flags/toast_no_weakref_flag_values.textproto b/aconfig/ap4a/android.widget.flags/toast_no_weakref_flag_values.textproto
new file mode 100644
index 0000000..ae44573
--- /dev/null
+++ b/aconfig/ap4a/android.widget.flags/toast_no_weakref_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "toast_no_weakref"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/Android.bp b/aconfig/ap4a/com.android.aconfig.test/Android.bp
new file mode 100644
index 0000000..6208209
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/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-platform_build_release-ap4a-com.android.aconfig.test-all",
+  package: "com.android.aconfig.test",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto b/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
new file mode 100644
index 0000000..1ff36d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_exported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_fixed_ro_exported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto b/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
new file mode 100644
index 0000000..342cf85
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/enabled_fixed_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_fixed_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto b/aconfig/ap4a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
new file mode 100644
index 0000000..409b459
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/enabled_ro_exported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_ro_exported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/enabled_ro_flag_values.textproto b/aconfig/ap4a/com.android.aconfig.test/enabled_ro_flag_values.textproto
new file mode 100644
index 0000000..139a636
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/enabled_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.aconfig.test/enabled_rw_flag_values.textproto b/aconfig/ap4a/com.android.aconfig.test/enabled_rw_flag_values.textproto
new file mode 100644
index 0000000..22adf04
--- /dev/null
+++ b/aconfig/ap4a/com.android.aconfig.test/enabled_rw_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.aconfig.test"
+  name: "enabled_rw"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/Android.bp b/aconfig/ap4a/com.android.adservices.flags/Android.bp
new file mode 100644
index 0000000..9a480f8
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.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-platform_build_release-ap4a-com.android.adservices.flags-all",
+  package: "com.android.adservices.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto
new file mode 100644
index 0000000..9e35a85
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/ad_id_cache_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "ad_id_cache_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto
new file mode 100644
index 0000000..23f284e
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/adext_data_service_apis_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "adext_data_service_apis_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto
new file mode 100644
index 0000000..8bff3df
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/adservices_enablement_check_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "adservices_enablement_check_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..d32e1e5
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/adservices_outcomereceiver_r_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "adservices_outcomereceiver_r_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto
new file mode 100644
index 0000000..e786024
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/enable_adservices_api_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "enable_adservices_api_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto
new file mode 100644
index 0000000..463fda9
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/fledge_ad_selection_filtering_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "fledge_ad_selection_filtering_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto
new file mode 100644
index 0000000..502941a
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/fledge_auction_server_get_ad_selection_data_id_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "fledge_auction_server_get_ad_selection_data_id_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto
new file mode 100644
index 0000000..2f9fda9
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/fledge_custom_audience_auction_server_request_flags_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "fledge_custom_audience_auction_server_request_flags_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto
new file mode 100644
index 0000000..69ce304
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/fledge_server_auction_multi_cloud_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "fledge_server_auction_multi_cloud_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto
new file mode 100644
index 0000000..05f85ec
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/protected_signals_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "protected_signals_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto
new file mode 100644
index 0000000..4086aa5
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.flags/topics_encryption_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "topics_encryption_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.adservices.ondevicepersonalization.flags/Android.bp b/aconfig/ap4a/com.android.adservices.ondevicepersonalization.flags/Android.bp
new file mode 100644
index 0000000..e9efb4f
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.ondevicepersonalization.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-platform_build_release-ap4a-com.android.adservices.ondevicepersonalization.flags-all",
+  package: "com.android.adservices.ondevicepersonalization.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto b/aconfig/ap4a/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto
new file mode 100644
index 0000000..8de524a
--- /dev/null
+++ b/aconfig/ap4a/com.android.adservices.ondevicepersonalization.flags/on_device_personalization_apis_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.ondevicepersonalization.flags"
+  name: "on_device_personalization_apis_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/Android.bp b/aconfig/ap4a/com.android.appsearch.flags/Android.bp
new file mode 100644
index 0000000..f4c9606
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.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-platform_build_release-ap4a-com.android.appsearch.flags-all",
+  package: "com.android.appsearch.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto
new file mode 100644
index 0000000..5df27a6
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_enterprise_global_search_session_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_enterprise_global_search_session"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto
new file mode 100644
index 0000000..a8e1007
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_builder_hidden_methods_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_generic_document_builder_hidden_methods"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto
new file mode 100644
index 0000000..80048e8
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_generic_document_copy_constructor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_generic_document_copy_constructor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto
new file mode 100644
index 0000000..7b6aeb8
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_get_parent_types_and_indexable_nested_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_get_parent_types_and_indexable_nested_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto
new file mode 100644
index 0000000..bd9fc2b
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_grouping_type_per_schema_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_grouping_type_per_schema"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
new file mode 100644
index 0000000..2c321a1
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_informational_ranking_expressions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto
new file mode 100644
index 0000000..afc0914
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_list_filter_has_property_function_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_list_filter_has_property_function"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto
new file mode 100644
index 0000000..83538c0
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_put_documents_request_add_taken_actions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_put_documents_request_add_taken_actions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto
new file mode 100644
index 0000000..bf8415a
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_safe_parcelable_2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_safe_parcelable_2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
new file mode 100644
index 0000000..aaec476
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_schema_embedding_property_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto
new file mode 100644
index 0000000..a36ee6b
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_filter_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_search_spec_filter_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto
new file mode 100644
index 0000000..0516daa
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_search_spec_set_search_source_log_tag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_search_spec_set_search_source_log_tag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto
new file mode 100644
index 0000000..36a6927
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_set_publicly_visible_schema_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_set_publicly_visible_schema"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto b/aconfig/ap4a/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto
new file mode 100644
index 0000000..afb6b0e
--- /dev/null
+++ b/aconfig/ap4a/com.android.appsearch.flags/enable_set_schema_visible_to_configs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_set_schema_visible_to_configs"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/Android.bp b/aconfig/ap4a/com.android.bluetooth.flags/Android.bp
new file mode 100644
index 0000000..31992f3
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.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-platform_build_release-ap4a-com.android.bluetooth.flags-all",
+  package: "com.android.bluetooth.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
new file mode 100644
index 0000000..c44b717
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_aidl_encoding_interval"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto
new file mode 100644
index 0000000..985b9dd
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_async_allow_low_latency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_async_allow_low_latency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
new file mode 100644
index 0000000..048b691
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_check_lea_iso_channel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
new file mode 100644
index 0000000..07b6de5
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_fix_codec_type_in_java"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto
new file mode 100644
index 0000000..cf89ba0
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/a2dp_service_looper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_service_looper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
new file mode 100644
index 0000000..6b0e9f9
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "adm_always_fallback_to_available_device"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
new file mode 100644
index 0000000..6a33057
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "adm_fallback_when_wired_audio_disconnected"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto
new file mode 100644
index 0000000..3d642dc
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/allow_switching_hid_and_hogp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "allow_switching_hid_and_hogp"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto
new file mode 100644
index 0000000..dde206e
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/android_headtracker_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "android_headtracker_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
new file mode 100644
index 0000000..6f09486
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "android_os_identifier"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto
new file mode 100644
index 0000000..2da160c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/api_get_connection_state_using_identity_address_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "api_get_connection_state_using_identity_address"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
new file mode 100644
index 0000000..c1e99ba
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "asha_encrypted_l2c_coc"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto
new file mode 100644
index 0000000..71e8251
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/asymmetric_phy_for_unidirectional_cis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "asymmetric_phy_for_unidirectional_cis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto
new file mode 100644
index 0000000..7ab4810
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/audio_port_binder_inherit_rt_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "audio_port_binder_inherit_rt"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
new file mode 100644
index 0000000..42ae133
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avdt_discover_seps_as_acceptor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
new file mode 100644
index 0000000..e4003e1
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avdtp_error_codes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto
new file mode 100644
index 0000000..3c133a7
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/avoid_static_loading_of_native_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avoid_static_loading_of_native"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
new file mode 100644
index 0000000..c0ac93f
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avrcp_connect_a2dp_with_delay"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
new file mode 100644
index 0000000..04cfddf
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avrcp_sdp_records"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto
new file mode 100644
index 0000000..05617b2
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/ble_check_data_length_on_legacy_advertising_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ble_check_data_length_on_legacy_advertising"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto
new file mode 100644
index 0000000..6470239
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/ble_context_map_remove_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ble_context_map_remove_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto
new file mode 100644
index 0000000..62332cf
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/ble_gatt_server_use_address_type_in_connection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ble_gatt_server_use_address_type_in_connection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
new file mode 100644
index 0000000..3627f9a
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ble_scan_adv_metrics_redesign"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto
new file mode 100644
index 0000000..66af7d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/bond_transport_after_bond_cancel_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "bond_transport_after_bond_cancel_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto
new file mode 100644
index 0000000..ecbc6fe
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/break_uhid_polling_early_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "break_uhid_polling_early"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto
new file mode 100644
index 0000000..6033980
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/bt_system_context_report_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "bt_system_context_report"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto
new file mode 100644
index 0000000..d7360f4
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/bta_dm_discover_both_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "bta_dm_discover_both"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto
new file mode 100644
index 0000000..c4fab1d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/btsec_check_valid_discovery_database_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "btsec_check_valid_discovery_database"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
new file mode 100644
index 0000000..d2555ab
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "cancel_open_discovery_client"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto
new file mode 100644
index 0000000..1c991cc
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/cancel_pairing_only_on_disconnected_transport_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "cancel_pairing_only_on_disconnected_transport"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/channel_sounding_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/channel_sounding_flag_values.textproto
new file mode 100644
index 0000000..1419616
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/channel_sounding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "channel_sounding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
new file mode 100644
index 0000000..fa35be3
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "choose_wrong_hfp_codec_in_specific_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto
new file mode 100644
index 0000000..f960f60
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/cleanup_le_only_device_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "cleanup_le_only_device_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
new file mode 100644
index 0000000..619735f
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "close_hid_only_if_connected"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto
new file mode 100644
index 0000000..10aa304
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/device_iot_config_logging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "device_iot_config_logging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto
new file mode 100644
index 0000000..878a0c4
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/enumerate_gatt_errors_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "enumerate_gatt_errors"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto
new file mode 100644
index 0000000..c6f7974
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/fast_bind_to_app_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "fast_bind_to_app"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
new file mode 100644
index 0000000..32f2268
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "fix_le_evt_cancelling_sdp_discovery"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto
new file mode 100644
index 0000000..eca9b66
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/fix_nonconnectable_scannable_advertisement_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "fix_nonconnectable_scannable_advertisement"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto
new file mode 100644
index 0000000..6bfbab5
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/gatt_cleanup_restricted_handles_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_cleanup_restricted_handles"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto
new file mode 100644
index 0000000..4840b2d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_device_busy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_fix_device_busy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
new file mode 100644
index 0000000..f49e974
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_fix_multiple_direct_connect"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto
new file mode 100644
index 0000000..e20afa3
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/gatt_rediscover_on_canceled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_rediscover_on_canceled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto
new file mode 100644
index 0000000..cb9f95e
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/headset_client_am_hf_volume_symmetric_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "headset_client_am_hf_volume_symmetric"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto
new file mode 100644
index 0000000..64c2f55
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/headtracker_codec_capability_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "headtracker_codec_capability"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
new file mode 100644
index 0000000..888f1f3
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "headtracker_sdu_size"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
new file mode 100644
index 0000000..b809001
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "hid_report_queuing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
new file mode 100644
index 0000000..f6efed4
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "identity_address_null_if_not_known"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
new file mode 100644
index 0000000..0211f69
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "initiate_multiple_hid_connections"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto
new file mode 100644
index 0000000..02e3fc8
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/key_missing_broadcast_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "key_missing_broadcast"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto
new file mode 100644
index 0000000..f423859
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/l2cap_p_ccb_check_rewrite_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "l2cap_p_ccb_check_rewrite"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
new file mode 100644
index 0000000..7c1c3be
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "l2cap_update_existing_conn_interval_with_base_interval"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
new file mode 100644
index 0000000..b49a200
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_ase_read_multiple_variable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto
new file mode 100644
index 0000000..1dd56cd
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_audio_base_ecosystem_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_audio_base_ecosystem_interval"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
new file mode 100644
index 0000000..9dc1db1
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_inquiry_duration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto
new file mode 100644
index 0000000..9d084b0
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_fix_remote_exception_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_scan_fix_remote_exception"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
new file mode 100644
index 0000000..10d8e55
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_scan_use_address_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto
new file mode 100644
index 0000000..5ac8b24
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/le_scan_use_uid_for_importance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_scan_use_uid_for_importance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto
new file mode 100644
index 0000000..04c3062
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_allowed_context_mask_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_allowed_context_mask"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto
new file mode 100644
index 0000000..80b66b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_assistant_peripheral_entrustment_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_assistant_peripheral_entrustment"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto
new file mode 100644
index 0000000..2a2ab4a
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_audio_handover_policies_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_audio_handover_policies"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto
new file mode 100644
index 0000000..f71d23c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_destroy_after_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_destroy_after_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto
new file mode 100644
index 0000000..fd7538e
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_extract_periodic_scanner_from_state_machine_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_extract_periodic_scanner_from_state_machine"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto
new file mode 100644
index 0000000..bfeee50
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_feature_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_feature_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto
new file mode 100644
index 0000000..9de2331
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_monitor_source_sync_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_monitor_source_sync_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
new file mode 100644
index 0000000..619ae1c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_update_metadata_callback"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto
new file mode 100644
index 0000000..94189ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_for_connected_devices_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_volume_control_for_connected_devices"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
new file mode 100644
index 0000000..ff3425c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_volume_control_primary_group_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto
new file mode 100644
index 0000000..c18d51d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_broadcast_volume_control_with_set_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_volume_control_with_set_volume"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
new file mode 100644
index 0000000..e65a3c3
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_call_start_scan_directly"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
new file mode 100644
index 0000000..c154e00
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_codec_config_callback_order_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto
new file mode 100644
index 0000000..5146b30
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_dynamic_spatial_audio_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_dynamic_spatial_audio"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto
new file mode 100644
index 0000000..3823058
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_getting_active_state_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_getting_active_state_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto
new file mode 100644
index 0000000..1393ec9
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_hal_client_asrc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_hal_client_asrc"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto
new file mode 100644
index 0000000..d3f349c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multicodec_aidl_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_multicodec_aidl_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto
new file mode 100644
index 0000000..fbdd528
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_multiple_vocs_instances_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_multiple_vocs_instances_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto
new file mode 100644
index 0000000..8da9b3d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_no_context_validate_streaming_request_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_no_context_validate_streaming_request"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
new file mode 100644
index 0000000..c43bf31
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_speed_up_reconfiguration_between_call"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto
new file mode 100644
index 0000000..3f4b6d7
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_start_request_state_mutex_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_start_request_state_mutex_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto
new file mode 100644
index 0000000..2bbd74c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_synchronize_start_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_synchronize_start"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
new file mode 100644
index 0000000..278bf20
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_use_audio_mode_listener"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto
new file mode 100644
index 0000000..07f48a2
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/map_limit_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "map_limit_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto
new file mode 100644
index 0000000..41afd9b
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/mcp_allow_play_without_active_player_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "mcp_allow_play_without_active_player"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto
new file mode 100644
index 0000000..107e568
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/metadata_api_inactive_audio_device_upon_connection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "metadata_api_inactive_audio_device_upon_connection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
new file mode 100644
index 0000000..b620bc8
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "name_discovery_for_le_pairing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto
new file mode 100644
index 0000000..50da072
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/opp_fix_multiple_notifications_issues_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "opp_fix_multiple_notifications_issues"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
new file mode 100644
index 0000000..d203f7d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "opp_ignore_content_observer_after_service_stop"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto
new file mode 100644
index 0000000..3982304
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/opp_start_activity_directly_from_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "opp_start_activity_directly_from_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
new file mode 100644
index 0000000..050d5a7
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "override_context_to_specify_device_id"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
new file mode 100644
index 0000000..b0c1a22
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "pairing_name_discovery_addresss_mismatch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto
new file mode 100644
index 0000000..5562ac5
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/pairing_on_unknown_transport_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "pairing_on_unknown_transport"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
new file mode 100644
index 0000000..456e9a0
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "pan_use_identity_address"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto
new file mode 100644
index 0000000..b40f27d
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/prevent_hogp_reconnect_when_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "prevent_hogp_reconnect_when_connected"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
new file mode 100644
index 0000000..c6ce8d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "progress_acl_scheduler_upon_incoming_connection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/randomize_device_level_media_ids_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/randomize_device_level_media_ids_flag_values.textproto
new file mode 100644
index 0000000..48d379c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/randomize_device_level_media_ids_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "randomize_device_level_media_ids"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto
new file mode 100644
index 0000000..0cc9f69
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/remove_address_map_on_unbond_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "remove_address_map_on_unbond"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
new file mode 100644
index 0000000..61dd079
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "remove_input_device_on_vup"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto
new file mode 100644
index 0000000..8109a82
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/reset_after_collision_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "reset_after_collision"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto
new file mode 100644
index 0000000..16c0693
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/reset_ag_state_on_collision_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "reset_ag_state_on_collision"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto
new file mode 100644
index 0000000..ba6adb6
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/respect_ble_scan_setting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "respect_ble_scan_setting"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto
new file mode 100644
index 0000000..36cddc2
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_always_use_mitm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "rfcomm_always_use_mitm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
new file mode 100644
index 0000000..3becf10
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "rfcomm_prevent_unnecessary_collisions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto
new file mode 100644
index 0000000..e2ca303
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/save_initial_hid_connection_policy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "save_initial_hid_connection_policy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto
new file mode 100644
index 0000000..5ec3622
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/scan_record_manufacturer_data_merge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "scan_record_manufacturer_data_merge"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto
new file mode 100644
index 0000000..c747ffe
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/settings_can_control_hap_preset_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "settings_can_control_hap_preset"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto
new file mode 100644
index 0000000..c537547
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/sink_audio_policy_handover_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "sink_audio_policy_handover"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
new file mode 100644
index 0000000..a41875a
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "stop_on_offload_fail"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto
new file mode 100644
index 0000000..6521b65
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/support_exclusive_manager_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "support_exclusive_manager"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto
new file mode 100644
index 0000000..a13ccda
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/suppress_hid_rejection_broadcast_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "suppress_hid_rejection_broadcast"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto
new file mode 100644
index 0000000..47edda6
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/temporary_pairing_device_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "temporary_pairing_device_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
new file mode 100644
index 0000000..4de285e
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "transmit_smp_packets_before_release"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
new file mode 100644
index 0000000..6a0cab4
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "unbonded_profile_forbid_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto
new file mode 100644
index 0000000..ee9bca1
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/unix_file_socket_creation_failure_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "unix_file_socket_creation_failure"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
new file mode 100644
index 0000000..f3a133c
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto
new file mode 100644
index 0000000..39a069a
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/use_local_oob_extended_command_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "use_local_oob_extended_command"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto b/aconfig/ap4a/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
new file mode 100644
index 0000000..c165d23
--- /dev/null
+++ b/aconfig/ap4a/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "wait_for_disconnect_before_unbond"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.btaudio.hal.flags/Android.bp b/aconfig/ap4a/com.android.btaudio.hal.flags/Android.bp
new file mode 100644
index 0000000..997f14e
--- /dev/null
+++ b/aconfig/ap4a/com.android.btaudio.hal.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-platform_build_release-ap4a-com.android.btaudio.hal.flags-all",
+  package: "com.android.btaudio.hal.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto b/aconfig/ap4a/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto
new file mode 100644
index 0000000..6d4b4b4
--- /dev/null
+++ b/aconfig/ap4a/com.android.btaudio.hal.flags/dsa_lea_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.btaudio.hal.flags"
+  name: "dsa_lea"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto b/aconfig/ap4a/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
new file mode 100644
index 0000000..5b7868c
--- /dev/null
+++ b/aconfig/ap4a/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.btaudio.hal.flags"
+  name: "leaudio_report_broadcast_ac_to_hal"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.carlauncher/Android.bp b/aconfig/ap4a/com.android.car.carlauncher/Android.bp
new file mode 100644
index 0000000..3ceb630
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.carlauncher/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-platform_build_release-ap4a-com.android.car.carlauncher-all",
+  package: "com.android.car.carlauncher",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.car.carlauncher/calm_mode_flag_values.textproto b/aconfig/ap4a/com.android.car.carlauncher/calm_mode_flag_values.textproto
new file mode 100644
index 0000000..d626923
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.carlauncher/calm_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.carlauncher"
+  name: "calm_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.carlauncher/media_session_card_flag_values.textproto b/aconfig/ap4a/com.android.car.carlauncher/media_session_card_flag_values.textproto
new file mode 100644
index 0000000..919e309
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.carlauncher/media_session_card_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.carlauncher"
+  name: "media_session_card"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.datasubscription/Android.bp b/aconfig/ap4a/com.android.car.datasubscription/Android.bp
new file mode 100644
index 0000000..ec6fc2f
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.datasubscription/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-platform_build_release-ap4a-com.android.car.datasubscription-all",
+  package: "com.android.car.datasubscription",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto b/aconfig/ap4a/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto
new file mode 100644
index 0000000..24d0bdf
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.datasubscription/data_subscription_pop_up_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.datasubscription"
+  name: "data_subscription_pop_up"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.dockutil/Android.bp b/aconfig/ap4a/com.android.car.dockutil/Android.bp
new file mode 100644
index 0000000..25c8ca3
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.dockutil/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-platform_build_release-ap4a-com.android.car.dockutil-all",
+  package: "com.android.car.dockutil",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.car.dockutil/dock_feature_flag_values.textproto b/aconfig/ap4a/com.android.car.dockutil/dock_feature_flag_values.textproto
new file mode 100644
index 0000000..95537d4
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.dockutil/dock_feature_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.dockutil"
+  name: "dock_feature"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.settings/Android.bp b/aconfig/ap4a/com.android.car.settings/Android.bp
new file mode 100644
index 0000000..efffc75
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.settings/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-platform_build_release-ap4a-com.android.car.settings-all",
+  package: "com.android.car.settings",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.car.settings/microphone_privacy_updates_flag_values.textproto b/aconfig/ap4a/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
new file mode 100644
index 0000000..92ac93f
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "microphone_privacy_updates"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto b/aconfig/ap4a/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
new file mode 100644
index 0000000..8ed43f0
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "required_infotainment_apps_settings_page"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.car.settings/update_date_and_time_page_flag_values.textproto b/aconfig/ap4a/com.android.car.settings/update_date_and_time_page_flag_values.textproto
new file mode 100644
index 0000000..6b17d4a
--- /dev/null
+++ b/aconfig/ap4a/com.android.car.settings/update_date_and_time_page_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "update_date_and_time_page"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.deviceaswebcam.flags/Android.bp b/aconfig/ap4a/com.android.deviceaswebcam.flags/Android.bp
new file mode 100644
index 0000000..8b29e0b
--- /dev/null
+++ b/aconfig/ap4a/com.android.deviceaswebcam.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-platform_build_release-ap4a-com.android.deviceaswebcam.flags-all",
+  package: "com.android.deviceaswebcam.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto b/aconfig/ap4a/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto
new file mode 100644
index 0000000..50d4401
--- /dev/null
+++ b/aconfig/ap4a/com.android.deviceaswebcam.flags/high_quality_toggle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.deviceaswebcam.flags"
+  name: "high_quality_toggle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.egg.flags/Android.bp b/aconfig/ap4a/com.android.egg.flags/Android.bp
new file mode 100644
index 0000000..1467d09
--- /dev/null
+++ b/aconfig/ap4a/com.android.egg.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-platform_build_release-ap4a-com.android.egg.flags-all",
+  package: "com.android.egg.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.egg.flags/flag_flag_flag_values.textproto b/aconfig/ap4a/com.android.egg.flags/flag_flag_flag_values.textproto
new file mode 100644
index 0000000..0c55dc6
--- /dev/null
+++ b/aconfig/ap4a/com.android.egg.flags/flag_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.egg.flags"
+  name: "flag_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.frameworks.sensorservice.flags/Android.bp b/aconfig/ap4a/com.android.frameworks.sensorservice.flags/Android.bp
new file mode 100644
index 0000000..3dc523a
--- /dev/null
+++ b/aconfig/ap4a/com.android.frameworks.sensorservice.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-platform_build_release-ap4a-com.android.frameworks.sensorservice.flags-all",
+  package: "com.android.frameworks.sensorservice.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto b/aconfig/ap4a/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto
new file mode 100644
index 0000000..3dfca5a
--- /dev/null
+++ b/aconfig/ap4a/com.android.frameworks.sensorservice.flags/dynamic_sensor_hal_reconnect_handling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.frameworks.sensorservice.flags"
+  name: "dynamic_sensor_hal_reconnect_handling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/Android.bp b/aconfig/ap4a/com.android.graphics.hwui.flags/Android.bp
new file mode 100644
index 0000000..a81dd8c
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.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-platform_build_release-ap4a-com.android.graphics.hwui.flags-all",
+  package: "com.android.graphics.hwui.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto
new file mode 100644
index 0000000..5bb84e4
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/animate_hdr_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "animate_hdr_transitions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto
new file mode 100644
index 0000000..dc793c0
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/clip_shader_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "clip_shader"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto
new file mode 100644
index 0000000..4f8a5ee
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_animations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "gainmap_animations"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto
new file mode 100644
index 0000000..04d7093
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/gainmap_constructor_with_metadata_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "gainmap_constructor_with_metadata"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto
new file mode 100644
index 0000000..d9dc0ee
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/high_contrast_text_luminance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "high_contrast_text_luminance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto
new file mode 100644
index 0000000..ee05901
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/limited_hdr_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "limited_hdr"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto
new file mode 100644
index 0000000..7016396
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/matrix_44_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "matrix_44"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto
new file mode 100644
index 0000000..162559d
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/requested_formats_v_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "requested_formats_v"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto b/aconfig/ap4a/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
new file mode 100644
index 0000000..d1c58a7
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "resample_gainmap_regions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.libgui.flags/Android.bp b/aconfig/ap4a/com.android.graphics.libgui.flags/Android.bp
new file mode 100644
index 0000000..ac803dd
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.libgui.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-platform_build_release-ap4a-com.android.graphics.libgui.flags-all",
+  package: "com.android.graphics.libgui.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto b/aconfig/ap4a/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
new file mode 100644
index 0000000..4b1eb46
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "bq_consumer_attach_callback"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto b/aconfig/ap4a/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto
new file mode 100644
index 0000000..7da0bde
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.libgui.flags/bq_setframerate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "bq_setframerate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto b/aconfig/ap4a/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto
new file mode 100644
index 0000000..03393c2
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.libgui.flags/frametimestamps_previousrelease_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "frametimestamps_previousrelease"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto b/aconfig/ap4a/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
new file mode 100644
index 0000000..0ab9221
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "trace_frame_rate_override"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/Android.bp
new file mode 100644
index 0000000..d5e64be
--- /dev/null
+++ b/aconfig/ap4a/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-platform_build_release-ap4a-com.android.graphics.surfaceflinger.flags-all",
+  package: "com.android.graphics.surfaceflinger.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto
new file mode 100644
index 0000000..fcdfedd
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/add_sf_skipped_frames_to_trace_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "add_sf_skipped_frames_to_trace"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto
new file mode 100644
index 0000000..a54d977
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/adpf_gpu_sf_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "adpf_gpu_sf"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
new file mode 100644
index 0000000..e53ed7e
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "allow_n_vsyncs_in_targeter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto
new file mode 100644
index 0000000..959898a
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/ce_fence_promise_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "ce_fence_promise"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto
new file mode 100644
index 0000000..072b4cf
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/commit_not_composited_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "commit_not_composited"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
new file mode 100644
index 0000000..b79d222
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/connected_display_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "connected_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto
new file mode 100644
index 0000000..150a90c
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/detached_mirror_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "detached_mirror"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto
new file mode 100644
index 0000000..872336d
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/display_protected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "display_protected"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto
new file mode 100644
index 0000000..dd11dcf
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/dont_skip_on_early_ro_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "dont_skip_on_early_ro"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto
new file mode 100644
index 0000000..7350f64
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_fro_dependent_features_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "enable_fro_dependent_features"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto
new file mode 100644
index 0000000..0a0cf01
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_layer_command_batching_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "enable_layer_command_batching"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
new file mode 100644
index 0000000..84371a8
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/enable_small_area_detection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "enable_small_area_detection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto
similarity index 100%
rename from aconfig/ap3a/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto
rename to aconfig/ap4a/com.android.graphics.surfaceflinger.flags/flush_buffer_slots_to_uncache_flag_values.textproto
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto
new file mode 100644
index 0000000..88f02ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/game_default_frame_rate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "game_default_frame_rate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto
new file mode 100644
index 0000000..76db86f
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/hotplug2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "hotplug2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto
new file mode 100644
index 0000000..e1a12f0
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/latch_unsignaled_with_auto_refresh_changed_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "latch_unsignaled_with_auto_refresh_changed"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto
new file mode 100644
index 0000000..969fb68
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/local_tonemap_screenshots_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "local_tonemap_screenshots"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto
new file mode 100644
index 0000000..fd44ce3
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/misc1_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "misc1"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto
new file mode 100644
index 0000000..744e538
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/multithreaded_present_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "multithreaded_present"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto
new file mode 100644
index 0000000..72fbf16
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/override_trusted_overlay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "override_trusted_overlay"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto
new file mode 100644
index 0000000..58c2559
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/protected_if_client_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "protected_if_client"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto
new file mode 100644
index 0000000..68eb33d
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/restore_blur_step_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "restore_blur_step"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto
new file mode 100644
index 0000000..d06e1f5
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/screenshot_fence_preservation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "screenshot_fence_preservation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto
new file mode 100644
index 0000000..7d3e01e
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/single_hop_screenshot_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "single_hop_screenshot"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto
new file mode 100644
index 0000000..c5dd063
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_24q4_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "vrr_bugfix_24q4"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
new file mode 100644
index 0000000..268fe3f
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "vrr_bugfix_dropped_frame"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
new file mode 100644
index 0000000..c4b2878
--- /dev/null
+++ b/aconfig/ap4a/com.android.graphics.surfaceflinger.flags/vrr_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "vrr_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/Android.bp b/aconfig/ap4a/com.android.hardware.input/Android.bp
new file mode 100644
index 0000000..198d9ce
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/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-platform_build_release-ap4a-com.android.hardware.input-all",
+  package: "com.android.hardware.input",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto
new file mode 100644
index 0000000..0f5134d
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/emoji_and_screenshot_keycodes_available_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "emoji_and_screenshot_keycodes_available"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto
new file mode 100644
index 0000000..7b3160a
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_bounce_keys_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_a11y_bounce_keys_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto
new file mode 100644
index 0000000..8bd312b
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_slow_keys_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_a11y_slow_keys_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto
new file mode 100644
index 0000000..ce1b170
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/keyboard_a11y_sticky_keys_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_a11y_sticky_keys_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
new file mode 100644
index 0000000..29700be
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_layout_manager_multi_user_ime_setup"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto
new file mode 100644
index 0000000..835c31f
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/keyboard_layout_preview_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_layout_preview_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
new file mode 100644
index 0000000..212c20c
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "modifier_shortcut_dump"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto
new file mode 100644
index 0000000..153b697
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/pointer_coords_is_resampled_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "pointer_coords_is_resampled_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto b/aconfig/ap4a/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto
new file mode 100644
index 0000000..974ad7e
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.input/touchpad_tap_dragging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "touchpad_tap_dragging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.libsensor.flags/Android.bp b/aconfig/ap4a/com.android.hardware.libsensor.flags/Android.bp
new file mode 100644
index 0000000..8392572
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.libsensor.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-platform_build_release-ap4a-com.android.hardware.libsensor.flags-all",
+  package: "com.android.hardware.libsensor.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto b/aconfig/ap4a/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
new file mode 100644
index 0000000..9482b49
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.libsensor.flags"
+  name: "sensor_event_queue_report_sensor_usage_in_tracing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto b/aconfig/ap4a/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto
new file mode 100644
index 0000000..57115a2
--- /dev/null
+++ b/aconfig/ap4a/com.android.hardware.libsensor.flags/sensormanager_ping_binder_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.libsensor.flags"
+  name: "sensormanager_ping_binder"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/Android.bp b/aconfig/ap4a/com.android.healthconnect.flags/Android.bp
new file mode 100644
index 0000000..1ec3971
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.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-platform_build_release-ap4a-com.android.healthconnect.flags-all",
+  package: "com.android.healthconnect.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/background_read_flag_values.textproto b/aconfig/ap4a/com.android.healthconnect.flags/background_read_flag_values.textproto
new file mode 100644
index 0000000..4e53665
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.flags/background_read_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthconnect.flags"
+  name: "background_read"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/history_read_flag_values.textproto b/aconfig/ap4a/com.android.healthconnect.flags/history_read_flag_values.textproto
new file mode 100644
index 0000000..28f972c
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.flags/history_read_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthconnect.flags"
+  name: "history_read"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto b/aconfig/ap4a/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto
new file mode 100644
index 0000000..ffd7982
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.flags/read_exercise_routes_all_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthconnect.flags"
+  name: "read_exercise_routes_all_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/skin_temperature_flag_values.textproto b/aconfig/ap4a/com.android.healthconnect.flags/skin_temperature_flag_values.textproto
new file mode 100644
index 0000000..5320e10
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.flags/skin_temperature_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthconnect.flags"
+  name: "skin_temperature"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.healthconnect.flags/training_plans_flag_values.textproto b/aconfig/ap4a/com.android.healthconnect.flags/training_plans_flag_values.textproto
new file mode 100644
index 0000000..586ff23
--- /dev/null
+++ b/aconfig/ap4a/com.android.healthconnect.flags/training_plans_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthconnect.flags"
+  name: "training_plans"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.icu/Android.bp b/aconfig/ap4a/com.android.icu/Android.bp
new file mode 100644
index 0000000..1c26325
--- /dev/null
+++ b/aconfig/ap4a/com.android.icu/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-platform_build_release-ap4a-com.android.icu-all",
+  package: "com.android.icu",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.icu/icu_v_api_flag_values.textproto b/aconfig/ap4a/com.android.icu/icu_v_api_flag_values.textproto
new file mode 100644
index 0000000..6b24e55
--- /dev/null
+++ b/aconfig/ap4a/com.android.icu/icu_v_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.icu"
+  name: "icu_v_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/Android.bp b/aconfig/ap4a/com.android.input.flags/Android.bp
new file mode 100644
index 0000000..cc547d6
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.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-platform_build_release-ap4a-com.android.input.flags-all",
+  package: "com.android.input.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.input.flags/device_associations_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/device_associations_flag_values.textproto
new file mode 100644
index 0000000..e4becc1
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/device_associations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "device_associations"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_input_event_tracing_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_input_event_tracing_flag_values.textproto
new file mode 100644
index 0000000..3c616c8
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_input_event_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_input_event_tracing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto
new file mode 100644
index 0000000..5151c53
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_input_filter_rust_impl_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_input_filter_rust_impl"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
new file mode 100644
index 0000000..d3cc791
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_keyboard_classifier"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_multi_device_input_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_multi_device_input_flag_values.textproto
new file mode 100644
index 0000000..a2025c9
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_multi_device_input_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_multi_device_input"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto
new file mode 100644
index 0000000..94580bc
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_new_mouse_pointer_ballistics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_new_mouse_pointer_ballistics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto
new file mode 100644
index 0000000..bc33174
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_prediction_pruning_via_jerk_thresholding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_prediction_pruning_via_jerk_thresholding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto
new file mode 100644
index 0000000..8e3e14d
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_touchpad_fling_stop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_touchpad_fling_stop"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto
new file mode 100644
index 0000000..d907e17
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/enable_touchpad_typing_palm_rejection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_touchpad_typing_palm_rejection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto
new file mode 100644
index 0000000..4d5adc7
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/hide_pointer_indicators_for_secure_windows_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "hide_pointer_indicators_for_secure_windows"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto
new file mode 100644
index 0000000..6046434
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/input_device_view_behavior_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "input_device_view_behavior_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto
new file mode 100644
index 0000000..39fb898
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/override_key_behavior_permission_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "override_key_behavior_permission_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
new file mode 100644
index 0000000..806d5d5
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "remove_input_channel_from_windowstate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto
new file mode 100644
index 0000000..5859fc4
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/report_palms_to_gestures_library_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "report_palms_to_gestures_library"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.input.flags/split_all_touches_flag_values.textproto b/aconfig/ap4a/com.android.input.flags/split_all_touches_flag_values.textproto
new file mode 100644
index 0000000..70bacd8
--- /dev/null
+++ b/aconfig/ap4a/com.android.input.flags/split_all_touches_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "split_all_touches"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/Android.bp b/aconfig/ap4a/com.android.intentresolver/Android.bp
new file mode 100644
index 0000000..f78dafa
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/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-platform_build_release-ap4a-com.android.intentresolver-all",
+  package: "com.android.intentresolver",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/enable_private_profile_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/enable_private_profile_flag_values.textproto
new file mode 100644
index 0000000..fbf1737
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/enable_private_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "enable_private_profile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
new file mode 100644
index 0000000..a7caadf
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_drawer_offset_on_config_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto
new file mode 100644
index 0000000..10b0c72
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_bug_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_empty_state_padding_bug"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto
new file mode 100644
index 0000000..c869d2d
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_empty_state_padding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_empty_state_padding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
new file mode 100644
index 0000000..cc00444
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_missing_drawer_offset_calculation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
new file mode 100644
index 0000000..42a5ad1
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_private_space_locked_on_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_private_space_locked_on_restart"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
new file mode 100644
index 0000000..859e4ac
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_shortcut_loader_job_leak"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto
new file mode 100644
index 0000000..25d8890
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_shortcuts_flashing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/modular_framework_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/modular_framework_flag_values.textproto
new file mode 100644
index 0000000..cd6b5cc
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/modular_framework_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "modular_framework"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/preview_image_loader_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/preview_image_loader_flag_values.textproto
new file mode 100644
index 0000000..a90a2a6
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/preview_image_loader_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "preview_image_loader"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.intentresolver/refine_system_actions_flag_values.textproto b/aconfig/ap4a/com.android.intentresolver/refine_system_actions_flag_values.textproto
new file mode 100644
index 0000000..e215ed9
--- /dev/null
+++ b/aconfig/ap4a/com.android.intentresolver/refine_system_actions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "refine_system_actions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/Android.bp b/aconfig/ap4a/com.android.internal.camera.flags/Android.bp
new file mode 100644
index 0000000..8c03f96
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.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-platform_build_release-ap4a-com.android.internal.camera.flags-all",
+  package: "com.android.internal.camera.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto
new file mode 100644
index 0000000..1e3b132
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/analytics_24q3_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "analytics_24q3"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
new file mode 100644
index 0000000..a4de78b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "bump_preview_frame_space_priority"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto
new file mode 100644
index 0000000..0e832be
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/cache_permission_services_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "cache_permission_services"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto
new file mode 100644
index 0000000..6c2c263
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/calculate_perf_override_during_session_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "calculate_perf_override_during_session_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto
new file mode 100644
index 0000000..3ac99fe
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_ae_mode_low_light_boost_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_ae_mode_low_light_boost"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto
new file mode 100644
index 0000000..fe6c8f6
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_device_setup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_device_setup"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto
new file mode 100644
index 0000000..7adcad7
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_extensions_characteristics_get_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_extensions_characteristics_get"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto
new file mode 100644
index 0000000..ccaf92c
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_hsum_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_hsum_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto
new file mode 100644
index 0000000..d94dce3
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_manual_flash_strength_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_manual_flash_strength_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto
new file mode 100644
index 0000000..ebfcde6
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/camera_privacy_allowlist_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "camera_privacy_allowlist"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto
new file mode 100644
index 0000000..f74d197
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/check_session_support_before_session_char_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "check_session_support_before_session_char"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/concert_mode_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/concert_mode_flag_values.textproto
new file mode 100644
index 0000000..85c4bff
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/concert_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "concert_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto
new file mode 100644
index 0000000..2c63dba
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/delay_lazy_hal_instantiation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "delay_lazy_hal_instantiation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto
new file mode 100644
index 0000000..33aab99
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/extension_10_bit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "extension_10_bit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto
new file mode 100644
index 0000000..b4af0db
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/feature_combination_query_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "feature_combination_query"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/inject_session_params_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/inject_session_params_flag_values.textproto
new file mode 100644
index 0000000..9040a7b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/inject_session_params_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "inject_session_params"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
new file mode 100644
index 0000000..f1bd20d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "multi_res_raw_reprocessing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto
new file mode 100644
index 0000000..3d66cdf
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/multiresolution_imagereader_usage_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "multiresolution_imagereader_usage_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto
new file mode 100644
index 0000000..01a9fdf
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/return_buffers_outside_locks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "return_buffers_outside_locks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto
new file mode 100644
index 0000000..8dc4382
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/session_hal_buf_manager_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "session_hal_buf_manager"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
new file mode 100644
index 0000000..8e052d7
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "single_thread_executor_naming"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto
new file mode 100644
index 0000000..df9718e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/use_ro_board_api_level_for_vndk_version_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "use_ro_board_api_level_for_vndk_version"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto b/aconfig/ap4a/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto
new file mode 100644
index 0000000..f865f57
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.camera.flags/use_system_api_for_vndk_version_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "use_system_api_for_vndk_version"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.compat.flags/Android.bp b/aconfig/ap4a/com.android.internal.compat.flags/Android.bp
new file mode 100644
index 0000000..2b5bb77
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.compat.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-platform_build_release-ap4a-com.android.internal.compat.flags-all",
+  package: "com.android.internal.compat.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto b/aconfig/ap4a/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto
new file mode 100644
index 0000000..125df20
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.compat.flags/skip_old_and_disabled_compat_logging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.compat.flags"
+  name: "skip_old_and_disabled_compat_logging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.foldables.flags/Android.bp b/aconfig/ap4a/com.android.internal.foldables.flags/Android.bp
new file mode 100644
index 0000000..0d3b187
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.foldables.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-platform_build_release-ap4a-com.android.internal.foldables.flags-all",
+  package: "com.android.internal.foldables.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto
new file mode 100644
index 0000000..d8a64ee
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.foldables.flags/fold_grace_period_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.foldables.flags"
+  name: "fold_grace_period_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto
new file mode 100644
index 0000000..68cc7a3
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.foldables.flags/fold_lock_setting_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.foldables.flags"
+  name: "fold_lock_setting_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.os/Android.bp b/aconfig/ap4a/com.android.internal.os/Android.bp
new file mode 100644
index 0000000..ad1e52d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.os/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-platform_build_release-ap4a-com.android.internal.os-all",
+  package: "com.android.internal.os",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto b/aconfig/ap4a/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto
new file mode 100644
index 0000000..193c3dc
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.os/enable_apache_http_legacy_preload_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.os"
+  name: "enable_apache_http_legacy_preload"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto b/aconfig/ap4a/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
new file mode 100644
index 0000000..ead161f
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.os"
+  name: "use_transaction_codes_for_unknown_methods"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.pm.pkg.component.flags/Android.bp b/aconfig/ap4a/com.android.internal.pm.pkg.component.flags/Android.bp
new file mode 100644
index 0000000..544273b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.pm.pkg.component.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-platform_build_release-ap4a-com.android.internal.pm.pkg.component.flags-all",
+  package: "com.android.internal.pm.pkg.component.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto b/aconfig/ap4a/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto
new file mode 100644
index 0000000..38bf2db
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.pm.pkg.component.flags/enable_per_process_use_embedded_dex_attr_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.pm.pkg.component.flags"
+  name: "enable_per_process_use_embedded_dex_attr"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/Android.bp b/aconfig/ap4a/com.android.internal.telephony.flags/Android.bp
new file mode 100644
index 0000000..ba53087
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.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-platform_build_release-ap4a-com.android.internal.telephony.flags-all",
+  package: "com.android.internal.telephony.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto
new file mode 100644
index 0000000..41cbeae
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/answer_audio_only_when_answering_via_mmi_code_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "answer_audio_only_when_answering_via_mmi_code"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto
new file mode 100644
index 0000000..de3c743
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/apn_setting_field_support_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "apn_setting_field_support_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto
new file mode 100644
index 0000000..10ae52d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_allow_roaming_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "auto_data_switch_allow_roaming"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto
new file mode 100644
index 0000000..63bbd2e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/auto_data_switch_uses_data_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "auto_data_switch_uses_data_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
new file mode 100644
index 0000000..34080b0
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "avoid_deleting_ims_object_from_cache"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto
new file mode 100644
index 0000000..3358308
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/backup_and_restore_for_enable_2g_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "backup_and_restore_for_enable_2g"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto
new file mode 100644
index 0000000..6082e18
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/call_extra_for_non_hold_supported_carriers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "call_extra_for_non_hold_supported_carriers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto
new file mode 100644
index 0000000..6140f93
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/carrier_enabled_satellite_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "carrier_enabled_satellite_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto
new file mode 100644
index 0000000..f02b0fd
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/carrier_restriction_rules_enhancement_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "carrier_restriction_rules_enhancement"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto
new file mode 100644
index 0000000..a2031aa
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/change_method_of_obtaining_ims_registration_radio_tech_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "change_method_of_obtaining_ims_registration_radio_tech"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto
new file mode 100644
index 0000000..4b87f75
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/clear_cached_ims_phone_number_when_device_lost_ims_registration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "clear_cached_ims_phone_number_when_device_lost_ims_registration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto
new file mode 100644
index 0000000..24a57c0
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/combine_ril_death_handle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "combine_ril_death_handle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto
new file mode 100644
index 0000000..4aa21d8
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/conference_hold_unhold_changed_to_send_message_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "conference_hold_unhold_changed_to_send_message"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto
new file mode 100644
index 0000000..43bad11
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/data_call_session_stats_captures_cross_sim_calling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "data_call_session_stats_captures_cross_sim_calling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto
new file mode 100644
index 0000000..193bd8c
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/data_only_cellular_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "data_only_cellular_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto
new file mode 100644
index 0000000..ab1859c
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/data_rat_metric_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "data_rat_metric_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
new file mode 100644
index 0000000..332dcf3
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "delay_phone_account_registration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto
new file mode 100644
index 0000000..c983ba9
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/dismiss_network_selection_notification_on_sim_disable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "dismiss_network_selection_notification_on_sim_disable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
new file mode 100644
index 0000000..8e2deed
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/do_not_override_precise_label_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "do_not_override_precise_label"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto
new file mode 100644
index 0000000..6e9963c
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/dsrs_diagnostics_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "dsrs_diagnostics_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto
new file mode 100644
index 0000000..c150338
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_aead_algorithms_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_aead_algorithms"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
new file mode 100644
index 0000000..e81143b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_carrier_config_n1_control_attempt2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto
new file mode 100644
index 0000000..021a6b8
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_identifier_disclosure_transparency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto
new file mode 100644
index 0000000..fc30519
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_identifier_disclosure_transparency_unsol_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_identifier_disclosure_transparency_unsol_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto
new file mode 100644
index 0000000..f7473d4
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_modem_cipher_transparency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto
new file mode 100644
index 0000000..60d19ab
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_modem_cipher_transparency_unsol_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_modem_cipher_transparency_unsol_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto
new file mode 100644
index 0000000..5907b2e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_multiple_sa_proposals_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_multiple_sa_proposals"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto
new file mode 100644
index 0000000..b87f1b2
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_sip_subscribe_retry_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_sip_subscribe_retry"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto
new file mode 100644
index 0000000..1eea089
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_telephony_analytics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_telephony_analytics"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto
new file mode 100644
index 0000000..1842b14
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enable_wps_check_api_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_wps_check_api_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto
new file mode 100644
index 0000000..923327a
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enforce_telephony_feature_mapping"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto
new file mode 100644
index 0000000..a2470aa
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/enforce_telephony_feature_mapping_for_public_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enforce_telephony_feature_mapping_for_public_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto
new file mode 100644
index 0000000..cc63472
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/ensure_access_to_call_settings_is_restricted_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "ensure_access_to_call_settings_is_restricted"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto
new file mode 100644
index 0000000..affcd11
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/esim_available_memory_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "esim_available_memory"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto
new file mode 100644
index 0000000..5bfd16b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/esim_bootstrap_provisioning_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "esim_bootstrap_provisioning_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
new file mode 100644
index 0000000..b3e18e8
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "hangup_emergency_call_for_cross_sim_redialing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto
new file mode 100644
index 0000000..4b159b1
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/hide_prefer_3g_item_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "hide_prefer_3g_item"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/hide_roaming_icon_flag_values.textproto
new file mode 100644
index 0000000..6da4289
--- /dev/null
+++ b/aconfig/ap4a/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/ap4a/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto
new file mode 100644
index 0000000..50e0719
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/ignore_already_terminated_incoming_call_before_registering_listener_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "ignore_already_terminated_incoming_call_before_registering_listener"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto
new file mode 100644
index 0000000..871d3cc
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/imsi_key_retry_download_on_phone_unlock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "imsi_key_retry_download_on_phone_unlock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto
new file mode 100644
index 0000000..b8857b4
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/keep_empty_requests_network_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "keep_empty_requests_network"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
new file mode 100644
index 0000000..e4e387f
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/log_mms_sms_database_access_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "log_mms_sms_database_access_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto
new file mode 100644
index 0000000..efd49b0
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_cdm_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "minimal_telephony_cdm_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto
new file mode 100644
index 0000000..4d9484b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/minimal_telephony_managers_conditional_on_features_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "minimal_telephony_managers_conditional_on_features"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto
new file mode 100644
index 0000000..2edc32d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/mms_disabled_error_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "mms_disabled_error"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
new file mode 100644
index 0000000..a0aa60a
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "mms_get_apn_from_pdsc"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto
new file mode 100644
index 0000000..f65c16e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/network_registration_info_reject_cause_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "network_registration_info_reject_cause"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/network_validation_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/network_validation_flag_values.textproto
new file mode 100644
index 0000000..ddd7058
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/network_validation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "network_validation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto
new file mode 100644
index 0000000..b73044a
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/notify_initial_ims_provisioning_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "notify_initial_ims_provisioning_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto
new file mode 100644
index 0000000..9577592
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/oem_enabled_satellite_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "oem_enabled_satellite_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
new file mode 100644
index 0000000..3baa27b
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "prevent_hangup_during_call_merge"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto
new file mode 100644
index 0000000..c747137
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "prevent_invocation_repeat_of_ril_call_when_device_does_not_support_voice"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto
new file mode 100644
index 0000000..ca44f76
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/prevent_system_server_and_phone_deadlock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "prevent_system_server_and_phone_deadlock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto
new file mode 100644
index 0000000..66c8079
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/reconnect_qualified_network_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "reconnect_qualified_network"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
new file mode 100644
index 0000000..1df0200
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "remap_disconnect_cause_sip_request_cancelled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto
new file mode 100644
index 0000000..8a9eedd
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/remove_country_code_from_local_singapore_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "remove_country_code_from_local_singapore_calls"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
new file mode 100644
index 0000000..04ac1d7
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/reorganize_roaming_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "reorganize_roaming_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto
new file mode 100644
index 0000000..78ddb58
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/reset_mobile_network_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "reset_mobile_network_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap3a/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto
similarity index 100%
rename from aconfig/ap3a/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto
rename to aconfig/ap4a/com.android.internal.telephony.flags/reset_primary_sim_default_values_flag_values.textproto
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto
new file mode 100644
index 0000000..b0179dc
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/roaming_notification_for_single_data_network_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "roaming_notification_for_single_data_network"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto
new file mode 100644
index 0000000..053348f
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/safer_get_phone_number_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "safer_get_phone_number"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto
new file mode 100644
index 0000000..13c2a8a
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/satellite_internet_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "satellite_internet"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto
new file mode 100644
index 0000000..98beb7c
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/set_no_reply_timer_for_cfnry_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "set_no_reply_timer_for_cfnry"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto
new file mode 100644
index 0000000..4f36b26
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/set_number_of_sim_for_ims_enable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "set_number_of_sim_for_ims_enable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto
new file mode 100644
index 0000000..cd67798
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/show_call_fail_notification_for_2g_toggle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "show_call_fail_notification_for_2g_toggle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto
new file mode 100644
index 0000000..1fade1d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/show_call_id_and_call_waiting_in_additional_settings_menu_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "show_call_id_and_call_waiting_in_additional_settings_menu"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
new file mode 100644
index 0000000..4c1092e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "sim_disabled_graceful_tear_down"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto
new file mode 100644
index 0000000..0f9d6b3
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/simultaneous_calling_indications_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "simultaneous_calling_indications"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto
new file mode 100644
index 0000000..138e01f
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/slicing_additional_error_codes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "slicing_additional_error_codes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
new file mode 100644
index 0000000..da5401d
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/sms_domain_selection_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "sms_domain_selection_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto
new file mode 100644
index 0000000..18a45b1
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/stop_spamming_emergency_notification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "stop_spamming_emergency_notification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto
new file mode 100644
index 0000000..2f8e337
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/support_nr_sa_rrc_idle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "support_nr_sa_rrc_idle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto
new file mode 100644
index 0000000..4eca0c8
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/support_psim_to_esim_conversion_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "support_psim_to_esim_conversion"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto
new file mode 100644
index 0000000..08c7fef
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/terminate_active_video_call_when_accepting_second_video_call_as_audio_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "terminate_active_video_call_when_accepting_second_video_call_as_audio_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
new file mode 100644
index 0000000..14b0b89
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "uicc_app_count_check_to_create_channel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
new file mode 100644
index 0000000..2df4c72
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "uicc_phone_number_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto
new file mode 100644
index 0000000..bf1f8d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/unregister_sms_broadcast_receiver_from_cat_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "unregister_sms_broadcast_receiver_from_cat_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
new file mode 100644
index 0000000..ed9c23e
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/update_ims_service_by_gathering_provisioning_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "update_ims_service_by_gathering_provisioning_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto
new file mode 100644
index 0000000..7fde769
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/update_roaming_state_to_set_wfc_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "update_roaming_state_to_set_wfc_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
new file mode 100644
index 0000000..626c921
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "use_carrier_config_for_cfnry_time_via_mmi"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto
new file mode 100644
index 0000000..c8c4b43
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/use_oem_domain_selection_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "use_oem_domain_selection_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto
new file mode 100644
index 0000000..5a22f73
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/use_relaxed_id_match_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "use_relaxed_id_match"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto b/aconfig/ap4a/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto
new file mode 100644
index 0000000..09d4e09
--- /dev/null
+++ b/aconfig/ap4a/com.android.internal.telephony.flags/vonr_enabled_metric_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "vonr_enabled_metric"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.ipsec.flags/Android.bp b/aconfig/ap4a/com.android.ipsec.flags/Android.bp
new file mode 100644
index 0000000..1ba375f
--- /dev/null
+++ b/aconfig/ap4a/com.android.ipsec.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-platform_build_release-ap4a-com.android.ipsec.flags-all",
+  package: "com.android.ipsec.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto b/aconfig/ap4a/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto
new file mode 100644
index 0000000..8cc5426
--- /dev/null
+++ b/aconfig/ap4a/com.android.ipsec.flags/dpd_disable_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.ipsec.flags"
+  name: "dpd_disable_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.ipsec.flags/dumpsys_api_flag_values.textproto b/aconfig/ap4a/com.android.ipsec.flags/dumpsys_api_flag_values.textproto
new file mode 100644
index 0000000..c737aa5
--- /dev/null
+++ b/aconfig/ap4a/com.android.ipsec.flags/dumpsys_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.ipsec.flags"
+  name: "dumpsys_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto b/aconfig/ap4a/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto
new file mode 100644
index 0000000..f48797e
--- /dev/null
+++ b/aconfig/ap4a/com.android.ipsec.flags/enabled_ike_options_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.ipsec.flags"
+  name: "enabled_ike_options_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.ipsec.flags/liveness_check_api_flag_values.textproto b/aconfig/ap4a/com.android.ipsec.flags/liveness_check_api_flag_values.textproto
new file mode 100644
index 0000000..168b1d3
--- /dev/null
+++ b/aconfig/ap4a/com.android.ipsec.flags/liveness_check_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.ipsec.flags"
+  name: "liveness_check_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/Android.bp b/aconfig/ap4a/com.android.launcher3/Android.bp
new file mode 100644
index 0000000..278aed1
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/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-platform_build_release-ap4a-com.android.launcher3-all",
+  package: "com.android.launcher3",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto
new file mode 100644
index 0000000..5ffcb7c
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_add_app_widget_via_config_activity_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_add_app_widget_via_config_activity_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_additional_home_animations_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_additional_home_animations_flag_values.textproto
new file mode 100644
index 0000000..497966a
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_additional_home_animations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_additional_home_animations"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto
new file mode 100644
index 0000000..5ac72fa
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_categorized_widget_suggestions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_categorized_widget_suggestions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
new file mode 100644
index 0000000..3f84cf3
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_cursor_hover_states_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_cursor_hover_states"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
new file mode 100644
index 0000000..063cf35
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_desktop_task_alpha_animation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_focus_outline_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_focus_outline_flag_values.textproto
new file mode 100644
index 0000000..8cd8a10
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_focus_outline_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_focus_outline"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_generated_previews_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_generated_previews_flag_values.textproto
new file mode 100644
index 0000000..9a76e9e
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_generated_previews_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_generated_previews"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto
new file mode 100644
index 0000000..24dc8ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_grid_migration_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_grid_migration_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto
new file mode 100644
index 0000000..962d990
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_handle_delayed_gesture_callbacks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_handle_delayed_gesture_callbacks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_home_transition_listener_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_home_transition_listener_flag_values.textproto
new file mode 100644
index 0000000..36c4a1e
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_home_transition_listener_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_home_transition_listener"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
new file mode 100644
index 0000000..7406c6f
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_hover_of_child_elements_in_taskview"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto
new file mode 100644
index 0000000..bff0bc6
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_launcher_br_metrics_fixed_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_launcher_br_metrics_fixed"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto
new file mode 100644
index 0000000..72126b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_narrow_grid_restore_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_narrow_grid_restore"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
new file mode 100644
index 0000000..5a33c0d
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_overview_command_helper_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto
new file mode 100644
index 0000000..6d51a08
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_predictive_back_gesture_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_predictive_back_gesture"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_private_space_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_private_space_flag_values.textproto
new file mode 100644
index 0000000..ac359ac
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_private_space_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_private_space"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
new file mode 100644
index 0000000..bc8397a
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_private_space_install_shortcut_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_private_space_install_shortcut"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_responsive_workspace_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_responsive_workspace_flag_values.textproto
new file mode 100644
index 0000000..7da7212
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_responsive_workspace_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_responsive_workspace"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto
new file mode 100644
index 0000000..6e4b35e
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_scaling_reveal_home_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_scaling_reveal_home_animation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto
new file mode 100644
index 0000000..52ca940
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_shortcut_dont_suggest_app_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_shortcut_dont_suggest_app"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_support_for_archiving_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_support_for_archiving_flag_values.textproto
new file mode 100644
index 0000000..9e039d6
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_support_for_archiving_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_support_for_archiving"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto
new file mode 100644
index 0000000..61b8b62
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_taskbar_pinning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_taskbar_pinning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_twoline_toggle_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_twoline_toggle_flag_values.textproto
new file mode 100644
index 0000000..6a8eafe
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_twoline_toggle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_twoline_toggle"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto
new file mode 100644
index 0000000..aa1f335
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_unfolded_two_pane_picker_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_unfolded_two_pane_picker"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto
new file mode 100644
index 0000000..6982d5e
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/enable_widget_tap_to_add_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_widget_tap_to_add"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
new file mode 100644
index 0000000..415f2bd
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_add_floating_mask_view"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_animation_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_animation_flag_values.textproto
new file mode 100644
index 0000000..a62f4e7
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_animation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
new file mode 100644
index 0000000..1d2030f
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_app_installer_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_app_installer_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
new file mode 100644
index 0000000..7979afb
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_restrict_accessibility_drag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_restrict_accessibility_drag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
new file mode 100644
index 0000000..a5fb5ef
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_restrict_item_drag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_restrict_item_drag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
new file mode 100644
index 0000000..848b0c7
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/private_space_sys_apps_separation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_sys_apps_separation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/use_activity_overlay_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/use_activity_overlay_flag_values.textproto
new file mode 100644
index 0000000..94e26bb
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/use_activity_overlay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "use_activity_overlay"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto b/aconfig/ap4a/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
new file mode 100644
index 0000000..28dd731
--- /dev/null
+++ b/aconfig/ap4a/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "use_new_icon_for_archived_apps"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.libcore/Android.bp b/aconfig/ap4a/com.android.libcore/Android.bp
new file mode 100644
index 0000000..64e9888
--- /dev/null
+++ b/aconfig/ap4a/com.android.libcore/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-platform_build_release-ap4a-com.android.libcore-all",
+  package: "com.android.libcore",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.libcore/hpke_v_apis_flag_values.textproto b/aconfig/ap4a/com.android.libcore/hpke_v_apis_flag_values.textproto
new file mode 100644
index 0000000..7ca5122
--- /dev/null
+++ b/aconfig/ap4a/com.android.libcore/hpke_v_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.libcore"
+  name: "hpke_v_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.libcore/v_apis_flag_values.textproto b/aconfig/ap4a/com.android.libcore/v_apis_flag_values.textproto
new file mode 100644
index 0000000..3d1363e
--- /dev/null
+++ b/aconfig/ap4a/com.android.libcore/v_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.libcore"
+  name: "v_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/Android.bp b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/Android.bp
new file mode 100644
index 0000000..1d17871
--- /dev/null
+++ b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.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-platform_build_release-ap4a-com.android.libhardware.dynamic.sensors.flags-all",
+  package: "com.android.libhardware.dynamic.sensors.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto
new file mode 100644
index 0000000..c275d37
--- /dev/null
+++ b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_hal_disconnect_dynamic_sensor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.libhardware.dynamic.sensors.flags"
+  name: "dynamic_sensors_hal_disconnect_dynamic_sensor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto
new file mode 100644
index 0000000..068228d
--- /dev/null
+++ b/aconfig/ap4a/com.android.libhardware.dynamic.sensors.flags/dynamic_sensors_le_audio_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.libhardware.dynamic.sensors.flags"
+  name: "dynamic_sensors_le_audio"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.aaudio/Android.bp b/aconfig/ap4a/com.android.media.aaudio/Android.bp
new file mode 100644
index 0000000..1d47fa5
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.aaudio/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-platform_build_release-ap4a-com.android.media.aaudio-all",
+  package: "com.android.media.aaudio",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto b/aconfig/ap4a/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto
new file mode 100644
index 0000000..f72dc37
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.aaudio/sample_rate_conversion_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.aaudio"
+  name: "sample_rate_conversion"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto b/aconfig/ap4a/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto
new file mode 100644
index 0000000..8028faf
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.aaudio/start_stop_client_from_command_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.aaudio"
+  name: "start_stop_client_from_command_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/Android.bp b/aconfig/ap4a/com.android.media.audio/Android.bp
new file mode 100644
index 0000000..fafc95d
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/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-platform_build_release-ap4a-com.android.media.audio-all",
+  package: "com.android.media.audio",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.audio/abs_volume_index_fix_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/abs_volume_index_fix_flag_values.textproto
new file mode 100644
index 0000000..296d2da
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/abs_volume_index_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "abs_volume_index_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto
new file mode 100644
index 0000000..4ef2f68
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/alarm_min_volume_zero_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "alarm_min_volume_zero"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto
new file mode 100644
index 0000000..1135533
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/bluetooth_mac_address_anonymization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "bluetooth_mac_address_anonymization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto
new file mode 100644
index 0000000..cca1a13
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/disable_prescale_absolute_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "disable_prescale_absolute_volume"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto
new file mode 100644
index 0000000..022edba
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/dsa_over_bt_le_audio_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "dsa_over_bt_le_audio"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto
new file mode 100644
index 0000000..7fa9187
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/music_fx_edge_to_edge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "music_fx_edge_to_edge"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/port_to_piid_simplification_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/port_to_piid_simplification_flag_values.textproto
new file mode 100644
index 0000000..b7ef27b
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/port_to_piid_simplification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "port_to_piid_simplification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto
new file mode 100644
index 0000000..59080e3
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/replace_stream_bt_sco_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "replace_stream_bt_sco"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto
new file mode 100644
index 0000000..c755b7a
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/ringer_mode_affects_alarm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "ringer_mode_affects_alarm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/set_stream_volume_order_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/set_stream_volume_order_flag_values.textproto
new file mode 100644
index 0000000..1f70295
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/set_stream_volume_order_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "set_stream_volume_order"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto b/aconfig/ap4a/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto
new file mode 100644
index 0000000..4c5a861
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audio/vgs_vss_sync_mute_order_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "vgs_vss_sync_mute_order"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/Android.bp b/aconfig/ap4a/com.android.media.audioserver/Android.bp
new file mode 100644
index 0000000..bdf6f36
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/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-platform_build_release-ap4a-com.android.media.audioserver-all",
+  package: "com.android.media.audioserver",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto b/aconfig/ap4a/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto
new file mode 100644
index 0000000..28ab556
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/direct_track_reprioritization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "direct_track_reprioritization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto b/aconfig/ap4a/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto
new file mode 100644
index 0000000..10b2161
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/fdtostring_timeout_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "fdtostring_timeout_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto b/aconfig/ap4a/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
new file mode 100644
index 0000000..f2c75b4
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "fix_call_audio_patch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto b/aconfig/ap4a/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto
new file mode 100644
index 0000000..cd7e95a
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/fix_concurrent_playback_behavior_with_bit_perfect_client_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "fix_concurrent_playback_behavior_with_bit_perfect_client"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto b/aconfig/ap4a/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto
new file mode 100644
index 0000000..de1c6f7
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.audioserver/mutex_priority_inheritance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "mutex_priority_inheritance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.codec.flags/Android.bp b/aconfig/ap4a/com.android.media.codec.flags/Android.bp
new file mode 100644
index 0000000..4cecb20
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.codec.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-platform_build_release-ap4a-com.android.media.codec.flags-all",
+  package: "com.android.media.codec.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.codec.flags/aidl_hal_flag_values.textproto b/aconfig/ap4a/com.android.media.codec.flags/aidl_hal_flag_values.textproto
new file mode 100644
index 0000000..d76629c
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.codec.flags/aidl_hal_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.codec.flags"
+  name: "aidl_hal"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.codec.flags/codec_importance_flag_values.textproto b/aconfig/ap4a/com.android.media.codec.flags/codec_importance_flag_values.textproto
new file mode 100644
index 0000000..02f663d
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.codec.flags/codec_importance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.codec.flags"
+  name: "codec_importance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.codec.flags/large_audio_frame_flag_values.textproto b/aconfig/ap4a/com.android.media.codec.flags/large_audio_frame_flag_values.textproto
new file mode 100644
index 0000000..e663db9
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.codec.flags/large_audio_frame_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.codec.flags"
+  name: "large_audio_frame"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.editing.flags/Android.bp b/aconfig/ap4a/com.android.media.editing.flags/Android.bp
new file mode 100644
index 0000000..7ccf02b
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.editing.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-platform_build_release-ap4a-com.android.media.editing.flags-all",
+  package: "com.android.media.editing.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto b/aconfig/ap4a/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto
new file mode 100644
index 0000000..df26637
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.editing.flags/add_media_metrics_editing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.editing.flags"
+  name: "add_media_metrics_editing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/Android.bp b/aconfig/ap4a/com.android.media.flags/Android.bp
new file mode 100644
index 0000000..fd465ec
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.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-platform_build_release-ap4a-com.android.media.flags-all",
+  package: "com.android.media.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
new file mode 100644
index 0000000..74ea00f
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/adjust_volume_for_foreground_app_playing_audio_without_media_session_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "adjust_volume_for_foreground_app_playing_audio_without_media_session"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto
new file mode 100644
index 0000000..9dfed31
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_audio_policies_device_and_bluetooth_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_audio_policies_device_and_bluetooth_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto
new file mode 100644
index 0000000..58e1872
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_built_in_speaker_route_suitability_statuses_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_built_in_speaker_route_suitability_statuses"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto
new file mode 100644
index 0000000..0327836
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_cross_user_routing_in_media_router2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_cross_user_routing_in_media_router2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
new file mode 100644
index 0000000..27314c8
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_full_scan_with_media_content_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto
new file mode 100644
index 0000000..079ea1d
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_get_transferable_routes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_get_transferable_routes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto
new file mode 100644
index 0000000..aab6e74
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_mr2_service_non_main_bg_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_mr2_service_non_main_bg_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto
new file mode 100644
index 0000000..1209d14
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_new_media_route_2_info_types_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_new_media_route_2_info_types"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto
new file mode 100644
index 0000000..2dce624
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_null_session_in_media_browser_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_null_session_in_media_browser_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto
new file mode 100644
index 0000000..8b904a5
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_prevention_of_keep_alive_route_providers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_prevention_of_keep_alive_route_providers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto
new file mode 100644
index 0000000..a2534fa
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_prevention_of_manager_scans_when_no_apps_scan_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_prevention_of_manager_scans_when_no_apps_scan"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto
new file mode 100644
index 0000000..9f15390
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_privileged_routing_for_media_routing_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_privileged_routing_for_media_routing_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto
new file mode 100644
index 0000000..aaf94b4
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_rlp_callbacks_in_media_router2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_rlp_callbacks_in_media_router2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto
new file mode 100644
index 0000000..179b36c
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_screen_off_scanning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_screen_off_scanning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto b/aconfig/ap4a/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto
new file mode 100644
index 0000000..43b4008
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.flags/enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_use_of_bluetooth_device_get_alias_for_mr2info_get_name"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.flags/enable_waiting_state_for_system_session_creation_request_flag_values.textproto b/aconfig/ap4a/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/ap4a/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/ap4a/com.android.media.flags/fallback_to_default_handling_when_media_session_has_fixed_volume_handling_flag_values.textproto b/aconfig/ap4a/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/ap4a/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/ap4a/com.android.media.mainline.flags/Android.bp b/aconfig/ap4a/com.android.media.mainline.flags/Android.bp
new file mode 100644
index 0000000..ceb0855
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.mainline.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-platform_build_release-ap4a-com.android.media.mainline.flags-all",
+  package: "com.android.media.mainline.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto b/aconfig/ap4a/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto
new file mode 100644
index 0000000..0636586
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.mainline.flags/enable_pid_to_media_session_2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.mainline.flags"
+  name: "enable_pid_to_media_session_2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.performance.flags/Android.bp b/aconfig/ap4a/com.android.media.performance.flags/Android.bp
new file mode 100644
index 0000000..0fbcc54
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.performance.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-platform_build_release-ap4a-com.android.media.performance.flags-all",
+  package: "com.android.media.performance.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto b/aconfig/ap4a/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto
new file mode 100644
index 0000000..319559c
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.performance.flags/media_description_ashmem_bitmap_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.performance.flags"
+  name: "media_description_ashmem_bitmap"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.media.playback.flags/Android.bp b/aconfig/ap4a/com.android.media.playback.flags/Android.bp
new file mode 100644
index 0000000..7d25e48
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.playback.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-platform_build_release-ap4a-com.android.media.playback.flags-all",
+  package: "com.android.media.playback.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto b/aconfig/ap4a/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto
new file mode 100644
index 0000000..c6213ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.media.playback.flags/mediametadataretriever_default_rgba8888_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.playback.flags"
+  name: "mediametadataretriever_default_rgba8888"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.nearby.flags/Android.bp b/aconfig/ap4a/com.android.nearby.flags/Android.bp
new file mode 100644
index 0000000..2d9ea0f
--- /dev/null
+++ b/aconfig/ap4a/com.android.nearby.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-platform_build_release-ap4a-com.android.nearby.flags-all",
+  package: "com.android.nearby.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.nearby.flags/powered_off_finding_flag_values.textproto b/aconfig/ap4a/com.android.nearby.flags/powered_off_finding_flag_values.textproto
new file mode 100644
index 0000000..bb5f78d
--- /dev/null
+++ b/aconfig/ap4a/com.android.nearby.flags/powered_off_finding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nearby.flags"
+  name: "powered_off_finding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/Android.bp b/aconfig/ap4a/com.android.net.flags/Android.bp
new file mode 100644
index 0000000..9a99bcc
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.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-platform_build_release-ap4a-com.android.net.flags-all",
+  package: "com.android.net.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto
new file mode 100644
index 0000000..5d73a59
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/basic_background_restrictions_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "basic_background_restrictions_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/ipsec_transform_state_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/ipsec_transform_state_flag_values.textproto
new file mode 100644
index 0000000..eb927bd
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/ipsec_transform_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "ipsec_transform_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/net_capability_local_network_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/net_capability_local_network_flag_values.textproto
new file mode 100644
index 0000000..3b944f2
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/net_capability_local_network_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "net_capability_local_network"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto
new file mode 100644
index 0000000..c6b936d
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/nsd_subtypes_support_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "nsd_subtypes_support_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto
new file mode 100644
index 0000000..d7429b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/register_nsd_offload_engine_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "register_nsd_offload_engine_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/request_restricted_wifi_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/request_restricted_wifi_flag_values.textproto
new file mode 100644
index 0000000..ac5c924
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/request_restricted_wifi_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "request_restricted_wifi"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto
new file mode 100644
index 0000000..2b4efc9
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/set_data_saver_via_cm_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "set_data_saver_via_cm"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto
new file mode 100644
index 0000000..6907d4f
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/support_is_uid_networking_blocked_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "support_is_uid_networking_blocked"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/support_transport_satellite_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/support_transport_satellite_flag_values.textproto
new file mode 100644
index 0000000..8c92b61
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/support_transport_satellite_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "support_transport_satellite"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto b/aconfig/ap4a/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto
new file mode 100644
index 0000000..ac8b60c
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.flags/tethering_request_with_soft_ap_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "tethering_request_with_soft_ap_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.net.thread.flags/Android.bp b/aconfig/ap4a/com.android.net.thread.flags/Android.bp
new file mode 100644
index 0000000..afbee57
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.thread.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-platform_build_release-ap4a-com.android.net.thread.flags-all",
+  package: "com.android.net.thread.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.net.thread.flags/thread_enabled_flag_values.textproto b/aconfig/ap4a/com.android.net.thread.flags/thread_enabled_flag_values.textproto
new file mode 100644
index 0000000..0b1cc77
--- /dev/null
+++ b/aconfig/ap4a/com.android.net.thread.flags/thread_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.thread.flags"
+  name: "thread_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.nfc.flags/Android.bp b/aconfig/ap4a/com.android.nfc.flags/Android.bp
new file mode 100644
index 0000000..2b552df
--- /dev/null
+++ b/aconfig/ap4a/com.android.nfc.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-platform_build_release-ap4a-com.android.nfc.flags-all",
+  package: "com.android.nfc.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto b/aconfig/ap4a/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
new file mode 100644
index 0000000..c4a8c35
--- /dev/null
+++ b/aconfig/ap4a/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "auto_disable_observe_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.nfc.flags/reduce_state_transition_flag_values.textproto b/aconfig/ap4a/com.android.nfc.flags/reduce_state_transition_flag_values.textproto
new file mode 100644
index 0000000..8036887
--- /dev/null
+++ b/aconfig/ap4a/com.android.nfc.flags/reduce_state_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "reduce_state_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto b/aconfig/ap4a/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto
new file mode 100644
index 0000000..3762da1
--- /dev/null
+++ b/aconfig/ap4a/com.android.nfc.flags/statsd_ce_events_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "statsd_ce_events_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/Android.bp b/aconfig/ap4a/com.android.permission.flags/Android.bp
new file mode 100644
index 0000000..47ca081
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.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-platform_build_release-ap4a-com.android.permission.flags-all",
+  package: "com.android.permission.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto b/aconfig/ap4a/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
new file mode 100644
index 0000000..ffca5cf
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "add_banners_to_privacy_sensitive_apps_for_aaos"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/archiving_read_only_flag_values.textproto b/aconfig/ap4a/com.android.permission.flags/archiving_read_only_flag_values.textproto
new file mode 100644
index 0000000..e6f8fe7
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.flags/archiving_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "archiving_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/private_profile_supported_flag_values.textproto b/aconfig/ap4a/com.android.permission.flags/private_profile_supported_flag_values.textproto
new file mode 100644
index 0000000..4278cee
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.flags/private_profile_supported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "private_profile_supported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/private_profile_title_api_flag_values.textproto b/aconfig/ap4a/com.android.permission.flags/private_profile_title_api_flag_values.textproto
new file mode 100644
index 0000000..1d439a2
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.flags/private_profile_title_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "private_profile_title_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto b/aconfig/ap4a/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto
new file mode 100644
index 0000000..a8f66fb
--- /dev/null
+++ b/aconfig/ap4a/com.android.permission.flags/wear_privacy_dashboard_enabled_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "wear_privacy_dashboard_enabled_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.contactkeys.flags/Android.bp b/aconfig/ap4a/com.android.providers.contactkeys.flags/Android.bp
new file mode 100644
index 0000000..aed8d05
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.contactkeys.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-platform_build_release-ap4a-com.android.providers.contactkeys.flags-all",
+  package: "com.android.providers.contactkeys.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto b/aconfig/ap4a/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto
new file mode 100644
index 0000000..b291f0a
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.contactkeys.flags/contactkeys_strip_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.contactkeys.flags"
+  name: "contactkeys_strip_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/Android.bp b/aconfig/ap4a/com.android.providers.media.flags/Android.bp
new file mode 100644
index 0000000..c550486
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.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-platform_build_release-ap4a-com.android.providers.media.flags-all",
+  package: "com.android.providers.media.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto b/aconfig/ap4a/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto
new file mode 100644
index 0000000..62bf9fa
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.flags/access_media_owner_package_name_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "access_media_owner_package_name_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto b/aconfig/ap4a/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto
new file mode 100644
index 0000000..8586346
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.flags/pick_ordered_images_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "pick_ordered_images"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/picker_accent_color_flag_values.textproto b/aconfig/ap4a/com.android.providers.media.flags/picker_accent_color_flag_values.textproto
new file mode 100644
index 0000000..aaf138a
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.flags/picker_accent_color_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "picker_accent_color"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/picker_default_tab_flag_values.textproto b/aconfig/ap4a/com.android.providers.media.flags/picker_default_tab_flag_values.textproto
new file mode 100644
index 0000000..ff2d2b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.flags/picker_default_tab_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "picker_default_tab"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto b/aconfig/ap4a/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto
new file mode 100644
index 0000000..816e67f
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.media.flags/picker_recent_selection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "picker_recent_selection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/Android.bp b/aconfig/ap4a/com.android.providers.settings/Android.bp
new file mode 100644
index 0000000..0027a03
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/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-platform_build_release-ap4a-com.android.providers.settings-all",
+  package: "com.android.providers.settings",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto b/aconfig/ap4a/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
new file mode 100644
index 0000000..a9ebaa5
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "ignore_xml_for_read_only_flags"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto b/aconfig/ap4a/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto
new file mode 100644
index 0000000..a05654d
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/load_aconfig_defaults_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "load_aconfig_defaults"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto b/aconfig/ap4a/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto
new file mode 100644
index 0000000..18b5d58
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/load_apex_aconfig_protobufs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "load_apex_aconfig_protobufs"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto b/aconfig/ap4a/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto
new file mode 100644
index 0000000..a93cc01
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/notify_individual_aconfig_sysprop_changed_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "notify_individual_aconfig_sysprop_changed"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto b/aconfig/ap4a/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto
new file mode 100644
index 0000000..075d9b0
--- /dev/null
+++ b/aconfig/ap4a/com.android.providers.settings/stage_all_aconfig_flags_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "stage_all_aconfig_flags"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/Android.bp b/aconfig/ap4a/com.android.sdksandbox.flags/Android.bp
new file mode 100644
index 0000000..4c91902
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.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-platform_build_release-ap4a-com.android.sdksandbox.flags-all",
+  package: "com.android.sdksandbox.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto b/aconfig/ap4a/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto
new file mode 100644
index 0000000..5c32a95
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.flags/first_and_last_sdk_sandbox_uid_public_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "first_and_last_sdk_sandbox_uid_public"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto b/aconfig/ap4a/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto
new file mode 100644
index 0000000..72294e0
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.flags/sandbox_activity_sdk_based_context_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "sandbox_activity_sdk_based_context"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto b/aconfig/ap4a/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto
new file mode 100644
index 0000000..0ea5c49
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.flags/sdk_sandbox_uid_to_app_uid_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "sdk_sandbox_uid_to_app_uid_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto b/aconfig/ap4a/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto
new file mode 100644
index 0000000..9e075c4
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.flags/selinux_input_selector_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "selinux_input_selector"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto b/aconfig/ap4a/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto
new file mode 100644
index 0000000..6d910ee
--- /dev/null
+++ b/aconfig/ap4a/com.android.sdksandbox.flags/selinux_sdk_sandbox_audit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "selinux_sdk_sandbox_audit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/Android.bp b/aconfig/ap4a/com.android.server.accessibility/Android.bp
new file mode 100644
index 0000000..0d278a3
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/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-platform_build_release-ap4a-com.android.server.accessibility-all",
+  package: "com.android.server.accessibility",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
new file mode 100644
index 0000000..ec955e2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "always_allow_observing_touch_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto
new file mode 100644
index 0000000..ce7ecc2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/clear_default_from_a11y_shortcut_target_service_restore_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "clear_default_from_a11y_shortcut_target_service_restore"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto
new file mode 100644
index 0000000..88546ec
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/compute_window_changes_on_a11y_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "compute_window_changes_on_a11y_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto
new file mode 100644
index 0000000..b9481f5
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/do_not_reset_key_event_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "do_not_reset_key_event_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto
new file mode 100644
index 0000000..b2c9f59
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/enable_color_correction_saturation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "enable_color_correction_saturation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto
new file mode 100644
index 0000000..a963eee
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/manager_avoid_receiver_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "manager_avoid_receiver_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto
new file mode 100644
index 0000000..3d5f22a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/manager_package_monitor_logic_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "manager_package_monitor_logic_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto
new file mode 100644
index 0000000..9a7d2d2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/pinch_zoom_zero_min_span_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "pinch_zoom_zero_min_span"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto
new file mode 100644
index 0000000..65476d8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/proxy_use_apps_on_virtual_device_listener_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "proxy_use_apps_on_virtual_device_listener"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/remove_on_window_infos_changed_handler_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/remove_on_window_infos_changed_handler_flag_values.textproto
new file mode 100644
index 0000000..72a23e8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/remove_on_window_infos_changed_handler_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "remove_on_window_infos_changed_handler"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
new file mode 100644
index 0000000..c9fb087
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/scan_packages_without_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "scan_packages_without_lock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto
new file mode 100644
index 0000000..e13bd33
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/send_hover_events_based_on_event_stream_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "send_hover_events_based_on_event_stream"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto b/aconfig/ap4a/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto
new file mode 100644
index 0000000..06084c1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.accessibility/skip_package_change_before_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "skip_package_change_before_user_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.alarm/Android.bp b/aconfig/ap4a/com.android.server.alarm/Android.bp
new file mode 100644
index 0000000..8199497
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.alarm/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-platform_build_release-ap4a-com.android.server.alarm-all",
+  package: "com.android.server.alarm",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto b/aconfig/ap4a/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
new file mode 100644
index 0000000..db4fee2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.alarm"
+  name: "start_user_before_scheduled_alarms"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto b/aconfig/ap4a/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto
new file mode 100644
index 0000000..6a628df
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.alarm/use_frozen_state_to_drop_listener_alarms_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.alarm"
+  name: "use_frozen_state_to_drop_listener_alarms"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/Android.bp b/aconfig/ap4a/com.android.server.am/Android.bp
new file mode 100644
index 0000000..d2c59fb
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/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-platform_build_release-ap4a-com.android.server.am-all",
+  package: "com.android.server.am",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto b/aconfig/ap4a/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto
new file mode 100644
index 0000000..f59fec5
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/avoid_repeated_bcast_re_enqueues_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "avoid_repeated_bcast_re_enqueues"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/avoid_resolving_type_flag_values.textproto b/aconfig/ap4a/com.android.server.am/avoid_resolving_type_flag_values.textproto
new file mode 100644
index 0000000..4898743
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/avoid_resolving_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "avoid_resolving_type"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/batching_oom_adj_flag_values.textproto b/aconfig/ap4a/com.android.server.am/batching_oom_adj_flag_values.textproto
new file mode 100644
index 0000000..1b249c0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/batching_oom_adj_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "batching_oom_adj"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto b/aconfig/ap4a/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
new file mode 100644
index 0000000..2b58350
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "enable_dropbox_watchdog_headers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/fgs_boot_completed_flag_values.textproto b/aconfig/ap4a/com.android.server.am/fgs_boot_completed_flag_values.textproto
new file mode 100644
index 0000000..1b0088d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/fgs_boot_completed_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "fgs_boot_completed"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/fgs_disable_saw_flag_values.textproto b/aconfig/ap4a/com.android.server.am/fgs_disable_saw_flag_values.textproto
new file mode 100644
index 0000000..ab36d1a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/fgs_disable_saw_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "fgs_disable_saw"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto b/aconfig/ap4a/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto
new file mode 100644
index 0000000..72d0300
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/follow_up_oomadj_updates_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "follow_up_oomadj_updates"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/log_broadcast_sent_event_flag_values.textproto b/aconfig/ap4a/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
new file mode 100644
index 0000000..3caa8df
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "log_broadcast_sent_event"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto b/aconfig/ap4a/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto
new file mode 100644
index 0000000..829d7d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/log_excessive_binder_proxies_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "log_excessive_binder_proxies"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto b/aconfig/ap4a/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto
new file mode 100644
index 0000000..21b5e75
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/migrate_full_oomadj_updates_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "migrate_full_oomadj_updates"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto b/aconfig/ap4a/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto
new file mode 100644
index 0000000..33e76e7
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/new_fgs_restriction_logic_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "new_fgs_restriction_logic"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto b/aconfig/ap4a/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto
new file mode 100644
index 0000000..b30d11a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/oomadjuster_correctness_rewrite_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "oomadjuster_correctness_rewrite"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto b/aconfig/ap4a/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto
new file mode 100644
index 0000000..8ff4037
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/service_binding_oom_adj_policy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "service_binding_oom_adj_policy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/simplify_process_traversal_flag_values.textproto b/aconfig/ap4a/com.android.server.am/simplify_process_traversal_flag_values.textproto
new file mode 100644
index 0000000..adae751
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/simplify_process_traversal_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "simplify_process_traversal"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/trace_receiver_registration_flag_values.textproto b/aconfig/ap4a/com.android.server.am/trace_receiver_registration_flag_values.textproto
new file mode 100644
index 0000000..1e886bd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/trace_receiver_registration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "trace_receiver_registration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto b/aconfig/ap4a/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
new file mode 100644
index 0000000..9e2f2b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "trace_update_app_freeze_state_lsp"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto b/aconfig/ap4a/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto
new file mode 100644
index 0000000..7e8d08d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.am/use_permission_manager_for_broadcast_delivery_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "use_permission_manager_for_broadcast_delivery_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.backup/Android.bp b/aconfig/ap4a/com.android.server.backup/Android.bp
new file mode 100644
index 0000000..55ea72c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.backup/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-platform_build_release-ap4a-com.android.server.backup-all",
+  package: "com.android.server.backup",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto b/aconfig/ap4a/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto
new file mode 100644
index 0000000..ce087dd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.backup/enable_clear_pipe_after_restore_file_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.backup"
+  name: "enable_clear_pipe_after_restore_file"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto b/aconfig/ap4a/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto
new file mode 100644
index 0000000..fb781ad
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.backup/enable_increase_datatypes_for_agent_logging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.backup"
+  name: "enable_increase_datatypes_for_agent_logging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto b/aconfig/ap4a/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto
new file mode 100644
index 0000000..20f33b9
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.backup/enable_max_size_writes_to_pipes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.backup"
+  name: "enable_max_size_writes_to_pipes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto b/aconfig/ap4a/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto
new file mode 100644
index 0000000..ed398ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.backup/enable_metrics_system_backup_agents_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.backup"
+  name: "enable_metrics_system_backup_agents"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.biometrics/Android.bp b/aconfig/ap4a/com.android.server.biometrics/Android.bp
new file mode 100644
index 0000000..6a0ae9e
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.biometrics/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-platform_build_release-ap4a-com.android.server.biometrics-all",
+  package: "com.android.server.biometrics",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto b/aconfig/ap4a/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
new file mode 100644
index 0000000..086fc38
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.biometrics"
+  name: "notify_fingerprints_loe"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto b/aconfig/ap4a/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
new file mode 100644
index 0000000..1669a3e
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.biometrics"
+  name: "set_ignore_speed_up"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.deviceconfig/Android.bp b/aconfig/ap4a/com.android.server.deviceconfig/Android.bp
new file mode 100644
index 0000000..c578ea1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.deviceconfig/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-platform_build_release-ap4a-com.android.server.deviceconfig-all",
+  package: "com.android.server.deviceconfig",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto b/aconfig/ap4a/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto
new file mode 100644
index 0000000..fe75413
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.deviceconfig/enable_custom_reboot_time_configurations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.deviceconfig"
+  name: "enable_custom_reboot_time_configurations"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.deviceidle/Android.bp b/aconfig/ap4a/com.android.server.deviceidle/Android.bp
new file mode 100644
index 0000000..17a17aa
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.deviceidle/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-platform_build_release-ap4a-com.android.server.deviceidle-all",
+  package: "com.android.server.deviceidle",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.deviceidle/remove_idle_location_flag_values.textproto b/aconfig/ap4a/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
new file mode 100644
index 0000000..545bbc6
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.deviceidle"
+  name: "remove_idle_location"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/Android.bp b/aconfig/ap4a/com.android.server.display.feature.flags/Android.bp
new file mode 100644
index 0000000..36d8da7
--- /dev/null
+++ b/aconfig/ap4a/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-platform_build_release-ap4a-com.android.server.display.feature.flags-all",
+  package: "com.android.server.display.feature.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto
new file mode 100644
index 0000000..650326a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/always_rotate_display_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "always_rotate_display_device"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto
new file mode 100644
index 0000000..d530b28
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/auto_brightness_modes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "auto_brightness_modes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto
new file mode 100644
index 0000000..ed46e7c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/back_up_smooth_display_and_force_peak_refresh_rate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "back_up_smooth_display_and_force_peak_refresh_rate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto
new file mode 100644
index 0000000..ac0dbd8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/brightness_wear_bedtime_mode_clamper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "brightness_wear_bedtime_mode_clamper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
new file mode 100644
index 0000000..3597ae2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "doze_brightness_float"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
new file mode 100644
index 0000000..6255d9a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_1_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_adaptive_tone_improvements_1"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
new file mode 100644
index 0000000..f98b233
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_adaptive_tone_improvements_2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_adaptive_tone_improvements_2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
new file mode 100644
index 0000000..34e7d70
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_error_handling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_connected_display_error_handling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
new file mode 100644
index 0000000..6d4df8e
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_connected_display_management_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_connected_display_management"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
new file mode 100644
index 0000000..02c31b8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_display_offload_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_display_offload"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
new file mode 100644
index 0000000..b7d18ae
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_hdr_clamper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_hdr_clamper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
new file mode 100644
index 0000000..a2891e0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_mode_limit_for_external_display_flag_values.textproto
@@ -0,0 +1,6 @@
+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/ap4a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
new file mode 100644
index 0000000..a3f4e47
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_nbm_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_nbm_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto
new file mode 100644
index 0000000..15e91ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_peak_refresh_rate_physical_limit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_peak_refresh_rate_physical_limit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto
new file mode 100644
index 0000000..ee1d2fd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_pixel_anisotropy_correction_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_pixel_anisotropy_correction"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto
new file mode 100644
index 0000000..ddccec1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_port_in_display_layout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_port_in_display_layout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto
new file mode 100644
index 0000000..7276d89
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_restrict_display_modes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_restrict_display_modes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto
new file mode 100644
index 0000000..87f2a7c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_synthetic_60hz_modes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_synthetic_60hz_modes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto
new file mode 100644
index 0000000..46594db
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_light_vote_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_vsync_low_light_vote"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto
new file mode 100644
index 0000000..15e1731
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/enable_vsync_low_power_vote_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_vsync_low_power_vote"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto
new file mode 100644
index 0000000..2a69602
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/fast_hdr_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "fast_hdr_transitions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
new file mode 100644
index 0000000..b865574
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "idle_screen_config_in_subscribing_light_sensor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto
new file mode 100644
index 0000000..2047313
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/idle_screen_refresh_rate_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "idle_screen_refresh_rate_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto
new file mode 100644
index 0000000..5c1d87a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/ignore_app_preferred_refresh_rate_request_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "ignore_app_preferred_refresh_rate_request"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto
new file mode 100644
index 0000000..78b9e61
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/offload_controls_doze_auto_brightness_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "offload_controls_doze_auto_brightness"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto
new file mode 100644
index 0000000..d693977
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/offload_doze_override_holds_wakelock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "offload_doze_override_holds_wakelock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
new file mode 100644
index 0000000..6c385f9
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "offload_session_cancel_block_screen_on"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto
new file mode 100644
index 0000000..2076b33
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/refactor_display_power_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "refactor_display_power_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto
new file mode 100644
index 0000000..10f0b2f
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/refresh_rate_voting_telemetry_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "refresh_rate_voting_telemetry"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto
new file mode 100644
index 0000000..1a0b8cd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/resolution_backup_restore_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "resolution_backup_restore"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto
new file mode 100644
index 0000000..07bd0ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/sensor_based_brightness_throttling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "sensor_based_brightness_throttling"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto b/aconfig/ap4a/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto
new file mode 100644
index 0000000..5375ad4
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.display.feature.flags/use_fusion_prox_sensor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "use_fusion_prox_sensor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.dreams/Android.bp b/aconfig/ap4a/com.android.server.dreams/Android.bp
new file mode 100644
index 0000000..1bd5320
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.dreams/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-platform_build_release-ap4a-com.android.server.dreams-all",
+  package: "com.android.server.dreams",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto b/aconfig/ap4a/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto
new file mode 100644
index 0000000..86e8b2e
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.dreams/use_battery_changed_broadcast_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.dreams"
+  name: "use_battery_changed_broadcast"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.feature.flags/Android.bp b/aconfig/ap4a/com.android.server.feature.flags/Android.bp
new file mode 100644
index 0000000..4daf798
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.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-platform_build_release-ap4a-com.android.server.feature.flags-all",
+  package: "com.android.server.feature.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto b/aconfig/ap4a/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto
new file mode 100644
index 0000000..1aaf44d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.feature.flags/enable_read_dropbox_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.feature.flags"
+  name: "enable_read_dropbox_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/Android.bp b/aconfig/ap4a/com.android.server.flags/Android.bp
new file mode 100644
index 0000000..2c39985
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.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-platform_build_release-ap4a-com.android.server.flags-all",
+  package: "com.android.server.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
new file mode 100644
index 0000000..8aec2fb
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "consolidate_battery_change_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/disable_system_compaction_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/disable_system_compaction_flag_values.textproto
new file mode 100644
index 0000000..d117a51
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/disable_system_compaction_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "disable_system_compaction"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto
new file mode 100644
index 0000000..ad28428
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/enable_odp_feature_guard_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "enable_odp_feature_guard"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
new file mode 100644
index 0000000..9d1f9da
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "modifier_shortcut_manager_multiuser"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto
new file mode 100644
index 0000000..a11b14d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/new_bugreport_keyboard_shortcut_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "new_bugreport_keyboard_shortcut"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/optional_background_install_control_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/optional_background_install_control_flag_values.textproto
new file mode 100644
index 0000000..af29a38
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/optional_background_install_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "optional_background_install_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/pin_webview_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/pin_webview_flag_values.textproto
new file mode 100644
index 0000000..621ecd8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/pin_webview_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "pin_webview"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto
new file mode 100644
index 0000000..12c8ba0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/pkg_targeted_battery_changed_not_sticky_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "pkg_targeted_battery_changed_not_sticky"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto b/aconfig/ap4a/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
new file mode 100644
index 0000000..6d55633
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "trace_battery_changed_broadcast_event"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.job/Android.bp b/aconfig/ap4a/com.android.server.job/Android.bp
new file mode 100644
index 0000000..60ea79f
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/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-platform_build_release-ap4a-com.android.server.job-all",
+  package: "com.android.server.job",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.job/count_quota_fix_flag_values.textproto b/aconfig/ap4a/com.android.server.job/count_quota_fix_flag_values.textproto
new file mode 100644
index 0000000..3e837b2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/count_quota_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "count_quota_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.job/create_work_chain_by_default_flag_values.textproto b/aconfig/ap4a/com.android.server.job/create_work_chain_by_default_flag_values.textproto
new file mode 100644
index 0000000..7a3d2a2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/create_work_chain_by_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "create_work_chain_by_default"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto b/aconfig/ap4a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
new file mode 100644
index 0000000..590fd53
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/relax_prefetch_connectivity_constraint_only_on_charger_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "relax_prefetch_connectivity_constraint_only_on_charger"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto b/aconfig/ap4a/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto
new file mode 100644
index 0000000..dba154d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/thermal_restrictions_to_fgs_jobs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "thermal_restrictions_to_fgs_jobs"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto b/aconfig/ap4a/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
new file mode 100644
index 0000000..8ee1f29
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "use_correct_process_state_for_logging"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.net/Android.bp b/aconfig/ap4a/com.android.server.net/Android.bp
new file mode 100644
index 0000000..1912300
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.net/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-platform_build_release-ap4a-com.android.server.net-all",
+  package: "com.android.server.net",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto b/aconfig/ap4a/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto
new file mode 100644
index 0000000..d9b8376
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.net/network_blocked_for_top_sleeping_and_above_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.net"
+  name: "network_blocked_for_top_sleeping_and_above"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.net/use_metered_firewall_chains_flag_values.textproto b/aconfig/ap4a/com.android.server.net/use_metered_firewall_chains_flag_values.textproto
new file mode 100644
index 0000000..85e1e59
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.net/use_metered_firewall_chains_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.net"
+  name: "use_metered_firewall_chains"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/Android.bp b/aconfig/ap4a/com.android.server.notification/Android.bp
new file mode 100644
index 0000000..0f015ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/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-platform_build_release-ap4a-com.android.server.notification-all",
+  package: "com.android.server.notification",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto
new file mode 100644
index 0000000..e8c3ff0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/all_notifs_need_ttl_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "all_notifs_need_ttl"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto
new file mode 100644
index 0000000..09fa8fc
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/autogroup_summary_icon_update_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "autogroup_summary_icon_update"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/expire_bitmaps_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/expire_bitmaps_flag_values.textproto
new file mode 100644
index 0000000..6fb6f65
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/expire_bitmaps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "expire_bitmaps"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto
new file mode 100644
index 0000000..5d9fdbd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/notification_hide_unused_channels_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "notification_hide_unused_channels"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto
new file mode 100644
index 0000000..b050be8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/persist_incomplete_restore_data_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "persist_incomplete_restore_data"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/refactor_attention_helper_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/refactor_attention_helper_flag_values.textproto
new file mode 100644
index 0000000..1b09583
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/refactor_attention_helper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "refactor_attention_helper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/reject_old_notifications_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/reject_old_notifications_flag_values.textproto
new file mode 100644
index 0000000..cbbe1e7
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/reject_old_notifications_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "reject_old_notifications"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto b/aconfig/ap4a/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto
new file mode 100644
index 0000000..d727423
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.notification/screenshare_notification_hiding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "screenshare_notification_hiding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.policy.feature.flags/Android.bp b/aconfig/ap4a/com.android.server.policy.feature.flags/Android.bp
new file mode 100644
index 0000000..331dcee
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.policy.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-platform_build_release-ap4a-com.android.server.policy.feature.flags-all",
+  package: "com.android.server.policy.feature.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto b/aconfig/ap4a/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto
new file mode 100644
index 0000000..93e78d9
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.policy.feature.flags/enable_dual_display_blocking_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.policy.feature.flags"
+  name: "enable_dual_display_blocking"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto b/aconfig/ap4a/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto
new file mode 100644
index 0000000..b9ceb78
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.policy.feature.flags/enable_foldables_posture_based_closed_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.policy.feature.flags"
+  name: "enable_foldables_posture_based_closed_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.policy/Android.bp b/aconfig/ap4a/com.android.server.policy/Android.bp
new file mode 100644
index 0000000..c863601
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.policy/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-platform_build_release-ap4a-com.android.server.policy-all",
+  package: "com.android.server.policy",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto b/aconfig/ap4a/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto
new file mode 100644
index 0000000..0c2d76c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.policy/support_input_wakeup_delegate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.policy"
+  name: "support_input_wakeup_delegate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.batterysaver/Android.bp b/aconfig/ap4a/com.android.server.power.batterysaver/Android.bp
new file mode 100644
index 0000000..b04eb4b
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.batterysaver/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-platform_build_release-ap4a-com.android.server.power.batterysaver-all",
+  package: "com.android.server.power.batterysaver",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto b/aconfig/ap4a/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto
new file mode 100644
index 0000000..8bf7bf8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.batterysaver/update_auto_turn_on_notification_string_and_action_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.batterysaver"
+  name: "update_auto_turn_on_notification_string_and_action"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.feature.flags/Android.bp b/aconfig/ap4a/com.android.server.power.feature.flags/Android.bp
new file mode 100644
index 0000000..f4c47d0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.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-platform_build_release-ap4a-com.android.server.power.feature.flags-all",
+  package: "com.android.server.power.feature.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto b/aconfig/ap4a/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto
new file mode 100644
index 0000000..c64007d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.feature.flags/enable_early_screen_timeout_detector_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.feature.flags"
+  name: "enable_early_screen_timeout_detector"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto b/aconfig/ap4a/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
new file mode 100644
index 0000000..6a8f979
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.feature.flags"
+  name: "improve_wakelock_latency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.hint/Android.bp b/aconfig/ap4a/com.android.server.power.hint/Android.bp
new file mode 100644
index 0000000..b9257e4
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.hint/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-platform_build_release-ap4a-com.android.server.power.hint-all",
+  package: "com.android.server.power.hint",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.power.hint/adpf_session_tag_flag_values.textproto b/aconfig/ap4a/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
new file mode 100644
index 0000000..3640a10
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.hint"
+  name: "adpf_session_tag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto b/aconfig/ap4a/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto
new file mode 100644
index 0000000..8d99f2f
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.hint/powerhint_thread_cleanup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.hint"
+  name: "powerhint_thread_cleanup"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/Android.bp b/aconfig/ap4a/com.android.server.power.optimization/Android.bp
new file mode 100644
index 0000000..3c4f01b
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/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-platform_build_release-ap4a-com.android.server.power.optimization-all",
+  package: "com.android.server.power.optimization",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
new file mode 100644
index 0000000..b04d0ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "add_battery_usage_stats_slice_atom"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
new file mode 100644
index 0000000..317954a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "battery_usage_stats_by_power_and_screen_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto
new file mode 100644
index 0000000..0e7fd9b
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/disable_system_service_power_attr_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "disable_system_service_power_attr"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/power_monitor_api_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/power_monitor_api_flag_values.textproto
new file mode 100644
index 0000000..9ab2149
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/power_monitor_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "power_monitor_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto
new file mode 100644
index 0000000..c987fd9
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/streamlined_battery_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "streamlined_battery_stats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto
new file mode 100644
index 0000000..f2813cc
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/streamlined_connectivity_battery_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "streamlined_connectivity_battery_stats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto b/aconfig/ap4a/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
new file mode 100644
index 0000000..6f56acf
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "streamlined_misc_battery_stats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.powerstats/Android.bp b/aconfig/ap4a/com.android.server.powerstats/Android.bp
new file mode 100644
index 0000000..f7cbffe
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.powerstats/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-platform_build_release-ap4a-com.android.server.powerstats-all",
+  package: "com.android.server.powerstats",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto b/aconfig/ap4a/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
new file mode 100644
index 0000000..7eb7727
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.powerstats"
+  name: "verify_non_null_arguments"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.stats/Android.bp b/aconfig/ap4a/com.android.server.stats/Android.bp
new file mode 100644
index 0000000..2bc458f
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.stats/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-platform_build_release-ap4a-com.android.server.stats-all",
+  package: "com.android.server.stats",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto b/aconfig/ap4a/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto
new file mode 100644
index 0000000..9a0bf0b
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.stats/add_mobile_bytes_transfer_by_proc_state_puller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.stats"
+  name: "add_mobile_bytes_transfer_by_proc_state_puller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto b/aconfig/ap4a/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
new file mode 100644
index 0000000..70ec766
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.stats"
+  name: "apply_network_stats_poll_rate_limit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/Android.bp b/aconfig/ap4a/com.android.server.telecom.flags/Android.bp
new file mode 100644
index 0000000..fe3b565
--- /dev/null
+++ b/aconfig/ap4a/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-platform_build_release-ap4a-com.android.server.telecom.flags-all",
+  package: "com.android.server.telecom.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto
new file mode 100644
index 0000000..a3363ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/add_call_uri_for_missed_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "add_call_uri_for_missed_calls"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto
new file mode 100644
index 0000000..2630a6a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/associated_user_refactor_for_work_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "associated_user_refactor_for_work_profile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto
new file mode 100644
index 0000000..fa8036c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/available_routes_never_updated_after_set_system_audio_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "available_routes_never_updated_after_set_system_audio_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/business_call_composer_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/business_call_composer_flag_values.textproto
new file mode 100644
index 0000000..73843a0
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/business_call_composer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "business_call_composer"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto
new file mode 100644
index 0000000..39db6b9
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/cache_call_audio_callbacks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "cache_call_audio_callbacks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/cache_call_events_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
new file mode 100644
index 0000000..5308fc1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "cache_call_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto
new file mode 100644
index 0000000..a9618e2
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/call_audio_communication_device_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "call_audio_communication_device_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto
new file mode 100644
index 0000000..f2e6144
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/call_details_id_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "call_details_id_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto
new file mode 100644
index 0000000..9d2f107
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/cancel_removal_on_emergency_redial_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "cancel_removal_on_emergency_redial"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto
new file mode 100644
index 0000000..8877bc1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/clear_communication_device_after_audio_ops_complete_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "clear_communication_device_after_audio_ops_complete"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto
new file mode 100644
index 0000000..57521be
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/communication_device_protected_by_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "communication_device_protected_by_lock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto
new file mode 100644
index 0000000..a4e467a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/early_binding_to_incall_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "early_binding_to_incall_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto
new file mode 100644
index 0000000..3ddd80c
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/early_update_internal_call_audio_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "early_update_internal_call_audio_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto
new file mode 100644
index 0000000..381ff99
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/ecc_keyguard_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "ecc_keyguard"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto
new file mode 100644
index 0000000..112a43d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/ensure_audio_mode_updates_on_foreground_call_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "ensure_audio_mode_updates_on_foreground_call_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto
new file mode 100644
index 0000000..b36c72d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/fix_audio_flicker_for_outgoing_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "fix_audio_flicker_for_outgoing_calls"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto
new file mode 100644
index 0000000..2593d25
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/gen_anom_report_on_focus_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "gen_anom_report_on_focus_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto
new file mode 100644
index 0000000..0282888
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/get_registered_phone_accounts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "get_registered_phone_accounts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/ignore_auto_route_to_watch_device_flag_values.textproto b/aconfig/ap4a/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/ap4a/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/ap4a/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto
new file mode 100644
index 0000000..0570208
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/is_new_outgoing_call_broadcast_unblocking_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "is_new_outgoing_call_broadcast_unblocking"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
new file mode 100644
index 0000000..5cecd19
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "on_call_endpoint_changed_ics_on_connected"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto
new file mode 100644
index 0000000..0c6ac1b
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/only_update_telephony_on_valid_sub_ids_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "only_update_telephony_on_valid_sub_ids"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/profile_user_support_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/profile_user_support_flag_values.textproto
new file mode 100644
index 0000000..cae762a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/profile_user_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "profile_user_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto
new file mode 100644
index 0000000..c1be302
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/reset_mute_when_entering_quiescent_bt_route_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "reset_mute_when_entering_quiescent_bt_route"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto
new file mode 100644
index 0000000..20186ba
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/resolve_switching_bt_devices_computation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "resolve_switching_bt_devices_computation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto
new file mode 100644
index 0000000..0a90e46
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/separately_bind_to_bt_incall_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "separately_bind_to_bt_incall_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto
new file mode 100644
index 0000000..89a64a3
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/set_audio_mode_before_abandon_focus_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "set_audio_mode_before_abandon_focus"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/set_mute_state_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/set_mute_state_flag_values.textproto
new file mode 100644
index 0000000..86f6684
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/set_mute_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "set_mute_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto
new file mode 100644
index 0000000..8417f60
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/skip_filter_phone_account_perform_dnd_filter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "skip_filter_phone_account_perform_dnd_filter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto
new file mode 100644
index 0000000..7ff85d8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/telecom_log_external_wearable_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "telecom_log_external_wearable_calls"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto
new file mode 100644
index 0000000..9e6d372
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/telecom_skip_log_based_on_extra_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "telecom_skip_log_based_on_extra"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
new file mode 100644
index 0000000..a63b4bf
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "transactional_hold_disconnects_unholdable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto
new file mode 100644
index 0000000..dc707d7
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/transactional_video_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "transactional_video_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto
new file mode 100644
index 0000000..3a3a487
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/use_actual_address_to_enter_connecting_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_actual_address_to_enter_connecting_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto
new file mode 100644
index 0000000..4648ac1
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/use_device_provided_serialized_ringer_vibration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_device_provided_serialized_ringer_vibration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto
new file mode 100644
index 0000000..c54c1bd
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/use_improved_listener_order_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_improved_listener_order"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
new file mode 100644
index 0000000..b99271e
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_stream_voice_call_tones"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto b/aconfig/ap4a/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto
new file mode 100644
index 0000000..e51811d
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.telecom.flags/voip_app_actions_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "voip_app_actions_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.usage/Android.bp b/aconfig/ap4a/com.android.server.usage/Android.bp
new file mode 100644
index 0000000..7726279
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.usage/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-platform_build_release-ap4a-com.android.server.usage-all",
+  package: "com.android.server.usage",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.usage/avoid_idle_check_flag_values.textproto b/aconfig/ap4a/com.android.server.usage/avoid_idle_check_flag_values.textproto
new file mode 100644
index 0000000..5569a41
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.usage/avoid_idle_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.usage"
+  name: "avoid_idle_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.usb.flags/Android.bp b/aconfig/ap4a/com.android.server.usb.flags/Android.bp
new file mode 100644
index 0000000..03cd84f
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.usb.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-platform_build_release-ap4a-com.android.server.usb.flags-all",
+  package: "com.android.server.usb.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto b/aconfig/ap4a/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto
new file mode 100644
index 0000000..6fb8de8
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.usb.flags/allow_restriction_of_overlay_activities_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.usb.flags"
+  name: "allow_restriction_of_overlay_activities"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto b/aconfig/ap4a/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto
new file mode 100644
index 0000000..8033e3a
--- /dev/null
+++ b/aconfig/ap4a/com.android.server.usb.flags/enable_bind_to_mtp_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.usb.flags"
+  name: "enable_bind_to_mtp_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/Android.bp b/aconfig/ap4a/com.android.settings.accessibility/Android.bp
new file mode 100644
index 0000000..acfe7d8
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/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-platform_build_release-ap4a-com.android.settings.accessibility-all",
+  package: "com.android.settings.accessibility",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
new file mode 100644
index 0000000..1c19119
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "audio_balance_state_description"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
new file mode 100644
index 0000000..7bb270c
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "check_prebundled_is_preinstalled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto
new file mode 100644
index 0000000..1a4e19b
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/edit_shortcuts_in_full_screen_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "edit_shortcuts_in_full_screen"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto
new file mode 100644
index 0000000..f469290
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/enable_color_contrast_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "enable_color_contrast_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto
new file mode 100644
index 0000000..37b8781
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/enable_hearing_aid_preset_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "enable_hearing_aid_preset_control"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto b/aconfig/ap4a/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
new file mode 100644
index 0000000..8f95bdb
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "never_restrict_accessibility_activity"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.development/Android.bp b/aconfig/ap4a/com.android.settings.development/Android.bp
new file mode 100644
index 0000000..ec4d31c
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.development/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-platform_build_release-ap4a-com.android.settings.development-all",
+  package: "com.android.settings.development",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto b/aconfig/ap4a/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto
new file mode 100644
index 0000000..f012feb
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.development/a2dp_offload_codec_extensibility_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.development"
+  name: "a2dp_offload_codec_extensibility_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.factory_reset/Android.bp b/aconfig/ap4a/com.android.settings.factory_reset/Android.bp
new file mode 100644
index 0000000..3f7fb56
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.factory_reset/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-platform_build_release-ap4a-com.android.settings.factory_reset-all",
+  package: "com.android.settings.factory_reset",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto b/aconfig/ap4a/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto
new file mode 100644
index 0000000..f6c26e8
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.factory_reset/enable_factory_reset_wizard_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.factory_reset"
+  name: "enable_factory_reset_wizard"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/Android.bp b/aconfig/ap4a/com.android.settings.flags/Android.bp
new file mode 100644
index 0000000..2bb65c6
--- /dev/null
+++ b/aconfig/ap4a/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-platform_build_release-ap4a-com.android.settings.flags-all",
+  package: "com.android.settings.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
new file mode 100644
index 0000000..97167ac
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "accessibility_appearance_settings_backup_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto
new file mode 100644
index 0000000..28bcef7
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/accessibility_show_app_info_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "accessibility_show_app_info_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/biometric_settings_provider_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/biometric_settings_provider_flag_values.textproto
new file mode 100644
index 0000000..378e2e4
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/biometric_settings_provider_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "biometric_settings_provider"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
new file mode 100644
index 0000000..b6ad626
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/dedupe_dnd_settings_channels_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "dedupe_dnd_settings_channels"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto
new file mode 100644
index 0000000..91e77c3
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/development_game_default_frame_rate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "development_game_default_frame_rate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto
new file mode 100644
index 0000000..1d921f8
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/development_hdr_sdr_ratio_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "development_hdr_sdr_ratio"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
new file mode 100644
index 0000000..cb79e58
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "disable_bonding_cancellation_for_orientation_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/dynamic_injection_category_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/dynamic_injection_category_flag_values.textproto
new file mode 100644
index 0000000..4f69ccb
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/dynamic_injection_category_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "dynamic_injection_category"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto
new file mode 100644
index 0000000..191ae5f
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/enable_auth_challenge_for_usb_preferences_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_auth_challenge_for_usb_preferences"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto
new file mode 100644
index 0000000..f8b0404
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/enable_bonded_bluetooth_device_searchable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_bonded_bluetooth_device_searchable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
new file mode 100644
index 0000000..3f2ede1
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/enable_device_diagnostics_in_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_device_diagnostics_in_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/enable_sound_backup_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/enable_sound_backup_flag_values.textproto
new file mode 100644
index 0000000..366932b
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/enable_sound_backup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_sound_backup"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
new file mode 100644
index 0000000..d31eea3
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "exclude_webcam_auth_challenge"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/homepage_revamp_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/homepage_revamp_flag_values.textproto
new file mode 100644
index 0000000..1ddd005
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/homepage_revamp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "homepage_revamp"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto
new file mode 100644
index 0000000..20ca9c8
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/is_dual_sim_onboarding_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "is_dual_sim_onboarding_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/locale_notification_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/locale_notification_enabled_flag_values.textproto
new file mode 100644
index 0000000..15759d4
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/locale_notification_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "locale_notification_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
new file mode 100644
index 0000000..9239762
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/mainline_module_explicit_intent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "mainline_module_explicit_intent"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto
new file mode 100644
index 0000000..67e2b39
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/new_apn_page_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "new_apn_page_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto
new file mode 100644
index 0000000..f52de57
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/protect_lock_after_timeout_with_auth_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "protect_lock_after_timeout_with_auth"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto
new file mode 100644
index 0000000..4b8659c
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/protect_screen_timeout_with_auth_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "protect_screen_timeout_with_auth"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto
new file mode 100644
index 0000000..7c2923f
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/remove_key_hide_enable_2g_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "remove_key_hide_enable_2g"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
new file mode 100644
index 0000000..9acf67e
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "rotation_connected_display_setting"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto
new file mode 100644
index 0000000..92bbc28
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/sfps_enroll_refinement_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "sfps_enroll_refinement"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
new file mode 100644
index 0000000..b0f22cd
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/show_factory_reset_cancel_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "show_factory_reset_cancel_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
new file mode 100644
index 0000000..4eca6fb
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "support_raw_dynamic_icons"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto
new file mode 100644
index 0000000..c350861
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/terms_of_address_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "terms_of_address_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto b/aconfig/ap4a/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto
new file mode 100644
index 0000000..1e5fe59
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.flags/udfps_enroll_calibration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "udfps_enroll_calibration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settings.media_drm/Android.bp b/aconfig/ap4a/com.android.settings.media_drm/Android.bp
new file mode 100644
index 0000000..4112eae
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.media_drm/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-platform_build_release-ap4a-com.android.settings.media_drm-all",
+  package: "com.android.settings.media_drm",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto b/aconfig/ap4a/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto
new file mode 100644
index 0000000..35664f2
--- /dev/null
+++ b/aconfig/ap4a/com.android.settings.media_drm/force_l3_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.media_drm"
+  name: "force_l3_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/Android.bp b/aconfig/ap4a/com.android.settingslib.flags/Android.bp
new file mode 100644
index 0000000..d12f714
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.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-platform_build_release-ap4a-com.android.settingslib.flags-all",
+  package: "com.android.settingslib.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto
new file mode 100644
index 0000000..4cd528e
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/enable_determining_advanced_details_header_with_metadata_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "enable_determining_advanced_details_header_with_metadata"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
new file mode 100644
index 0000000..e4bb494
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "enable_determining_spatial_audio_attributes_by_profile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto
new file mode 100644
index 0000000..0ca050c
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/enable_hide_exclusively_managed_bluetooth_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "enable_hide_exclusively_managed_bluetooth_device"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto
new file mode 100644
index 0000000..281916d
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/enable_set_preferred_transport_for_le_audio_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "enable_set_preferred_transport_for_le_audio_device"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
new file mode 100644
index 0000000..1fcefa0
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "extreme_power_low_state_vulnerability"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
new file mode 100644
index 0000000..718e765
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "volume_panel_broadcast_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.media.flags/Android.bp b/aconfig/ap4a/com.android.settingslib.media.flags/Android.bp
new file mode 100644
index 0000000..fa65702
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.media.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-platform_build_release-ap4a-com.android.settingslib.media.flags-all",
+  package: "com.android.settingslib.media.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto
new file mode 100644
index 0000000..1e9753f
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.media.flags/enable_output_switcher_for_system_routing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.media.flags"
+  name: "enable_output_switcher_for_system_routing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto
new file mode 100644
index 0000000..bcc91af
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.media.flags/remove_unnecessary_route_scanning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.media.flags"
+  name: "remove_unnecessary_route_scanning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
new file mode 100644
index 0000000..1f99807
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.media.flags/use_media_router2_for_info_media_manager_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.media.flags"
+  name: "use_media_router2_for_info_media_manager"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto
new file mode 100644
index 0000000..626df63
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.media.flags/use_playback_info_for_routing_controls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.media.flags"
+  name: "use_playback_info_for_routing_controls"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.widget.flags/Android.bp b/aconfig/ap4a/com.android.settingslib.widget.flags/Android.bp
new file mode 100644
index 0000000..06a9d75
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.widget.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-platform_build_release-ap4a-com.android.settingslib.widget.flags-all",
+  package: "com.android.settingslib.widget.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto
new file mode 100644
index 0000000..c1260d3
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.widget.flags/auto_hide_empty_lottie_res_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.widget.flags"
+  name: "auto_hide_empty_lottie_res"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp b/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp
new file mode 100644
index 0000000..6ca974b
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.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-platform_build_release-ap4a-com.android.settingslib.widget.selectorwithwidgetpreference.flags-all",
+  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto b/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
new file mode 100644
index 0000000..39b14bb
--- /dev/null
+++ b/aconfig/ap4a/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags"
+  name: "allow_set_title_max_lines"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.system.virtualmachine.flags/Android.bp b/aconfig/ap4a/com.android.system.virtualmachine.flags/Android.bp
new file mode 100644
index 0000000..08327c5
--- /dev/null
+++ b/aconfig/ap4a/com.android.system.virtualmachine.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-platform_build_release-ap4a-com.android.system.virtualmachine.flags-all",
+  package: "com.android.system.virtualmachine.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto b/aconfig/ap4a/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto
new file mode 100644
index 0000000..a87e318
--- /dev/null
+++ b/aconfig/ap4a/com.android.system.virtualmachine.flags/avf_v_test_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.system.virtualmachine.flags"
+  name: "avf_v_test_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/Android.bp b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/Android.bp
new file mode 100644
index 0000000..0d43b76
--- /dev/null
+++ b/aconfig/ap4a/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-platform_build_release-ap4a-com.android.systemui.accessibility.accessibilitymenu-all",
+  package: "com.android.systemui.accessibility.accessibilitymenu",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto
new file mode 100644
index 0000000..f2514d6
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/a11y_menu_snackbar_live_region_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.accessibility.accessibilitymenu"
+  name: "a11y_menu_snackbar_live_region"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
new file mode 100644
index 0000000..a3def86
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.accessibility.accessibilitymenu"
+  name: "action_bar_wrap_content"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
new file mode 100644
index 0000000..78599d4
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.accessibility.accessibilitymenu"
+  name: "hide_restricted_actions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.car/Android.bp b/aconfig/ap4a/com.android.systemui.car/Android.bp
new file mode 100644
index 0000000..23486de
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.car/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-platform_build_release-ap4a-com.android.systemui.car-all",
+  package: "com.android.systemui.car",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto b/aconfig/ap4a/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto
new file mode 100644
index 0000000..c4b372c
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.car/config_app_blocking_activities_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.car"
+  name: "config_app_blocking_activities"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.car/config_aware_systemui_flag_values.textproto b/aconfig/ap4a/com.android.systemui.car/config_aware_systemui_flag_values.textproto
new file mode 100644
index 0000000..e948ee3
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.car/config_aware_systemui_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.car"
+  name: "config_aware_systemui"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto b/aconfig/ap4a/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
new file mode 100644
index 0000000..c2c235d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.car"
+  name: "show_qc_sound_panel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.shared/Android.bp b/aconfig/ap4a/com.android.systemui.shared/Android.bp
new file mode 100644
index 0000000..4d30066
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.shared/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-platform_build_release-ap4a-com.android.systemui.shared-all",
+  package: "com.android.systemui.shared",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto b/aconfig/ap4a/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto
new file mode 100644
index 0000000..d79a6f0
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.shared/bouncer_area_exclusion_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.shared"
+  name: "bouncer_area_exclusion"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto
new file mode 100644
index 0000000..7ed7372
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui.shared/sidefps_controller_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.shared"
+  name: "sidefps_controller_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/Android.bp b/aconfig/ap4a/com.android.systemui/Android.bp
new file mode 100644
index 0000000..8b7a7fe
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/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-platform_build_release-ap4a-com.android.systemui-all",
+  package: "com.android.systemui",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto b/aconfig/ap4a/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto
new file mode 100644
index 0000000..8a18721
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/activity_transition_use_largest_window_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "activity_transition_use_largest_window"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto b/aconfig/ap4a/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
new file mode 100644
index 0000000..9698e72
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "add_black_background_for_window_magnifier"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/ambient_touch_monitor_listen_to_display_changes_flag_values.textproto b/aconfig/ap4a/com.android.systemui/ambient_touch_monitor_listen_to_display_changes_flag_values.textproto
new file mode 100644
index 0000000..5073423
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/ambient_touch_monitor_listen_to_display_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "ambient_touch_monitor_listen_to_display_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/app_clips_backlinks_flag_values.textproto b/aconfig/ap4a/com.android.systemui/app_clips_backlinks_flag_values.textproto
new file mode 100644
index 0000000..75f3e21
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/app_clips_backlinks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "app_clips_backlinks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto b/aconfig/ap4a/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto
new file mode 100644
index 0000000..254e69c
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/bind_keyguard_media_visibility_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "bind_keyguard_media_visibility"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/bp_icon_a11y_flag_values.textproto b/aconfig/ap4a/com.android.systemui/bp_icon_a11y_flag_values.textproto
new file mode 100644
index 0000000..4d51ebc
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/bp_icon_a11y_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "bp_icon_a11y"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/classic_flags_multi_user_flag_values.textproto b/aconfig/ap4a/com.android.systemui/classic_flags_multi_user_flag_values.textproto
new file mode 100644
index 0000000..7fd0172
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/classic_flags_multi_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "classic_flags_multi_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/clipboard_image_timeout_flag_values.textproto b/aconfig/ap4a/com.android.systemui/clipboard_image_timeout_flag_values.textproto
new file mode 100644
index 0000000..cc22cd5
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/clipboard_image_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "clipboard_image_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto b/aconfig/ap4a/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
new file mode 100644
index 0000000..cb39721
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "clipboard_noninteractive_on_lockscreen"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto b/aconfig/ap4a/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
new file mode 100644
index 0000000..8fc3212
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_bouncer_do_not_modify_plugin_open"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/communal_hub_flag_values.textproto b/aconfig/ap4a/com.android.systemui/communal_hub_flag_values.textproto
new file mode 100644
index 0000000..616bb8d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/communal_hub_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_hub"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
new file mode 100644
index 0000000..a7cef80
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_scene_ktf_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
new file mode 100644
index 0000000..2f331b8
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_timer_flicker_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
new file mode 100644
index 0000000..a69a441
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_widget_trampoline_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto
new file mode 100644
index 0000000..82519f0
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/contextual_tips_assistant_dismiss_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "contextual_tips_assistant_dismiss_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto b/aconfig/ap4a/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto
new file mode 100644
index 0000000..91b17ca
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/create_windowless_window_magnifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "create_windowless_window_magnifier"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto b/aconfig/ap4a/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto
new file mode 100644
index 0000000..803dbe1
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/dedicated_notif_inflation_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "dedicated_notif_inflation_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/delay_show_magnification_button_flag_values.textproto b/aconfig/ap4a/com.android.systemui/delay_show_magnification_button_flag_values.textproto
new file mode 100644
index 0000000..ed4e385
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/delay_show_magnification_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "delay_show_magnification_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto b/aconfig/ap4a/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto
new file mode 100644
index 0000000..ddaae91
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/delayed_wakelock_release_on_background_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "delayed_wakelock_release_on_background_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto
new file mode 100644
index 0000000..32cae65
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/device_entry_udfps_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "device_entry_udfps_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/dozeui_scheduling_alarms_background_execution_flag_values.textproto b/aconfig/ap4a/com.android.systemui/dozeui_scheduling_alarms_background_execution_flag_values.textproto
new file mode 100644
index 0000000..4c21207
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/dozeui_scheduling_alarms_background_execution_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "dozeui_scheduling_alarms_background_execution"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto b/aconfig/ap4a/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
new file mode 100644
index 0000000..355d388
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "dream_input_session_pilfer_once"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto b/aconfig/ap4a/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto
new file mode 100644
index 0000000..54524f4
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/dream_overlay_bouncer_swipe_direction_filtering_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "dream_overlay_bouncer_swipe_direction_filtering"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto
new file mode 100644
index 0000000..f101e00
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/edgeback_gesture_handler_get_running_tasks_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "edgeback_gesture_handler_get_running_tasks_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto
new file mode 100644
index 0000000..28b2545
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_background_keyguard_ondrawn_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_background_keyguard_ondrawn_callback"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto
new file mode 100644
index 0000000..b2e7ac9
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_contextual_tip_for_mute_volume"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto
new file mode 100644
index 0000000..04fa11f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_power_off_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_contextual_tip_for_power_off"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto
new file mode 100644
index 0000000..df6324d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_contextual_tip_for_take_screenshot_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_contextual_tip_for_take_screenshot"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_contextual_tips_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_contextual_tips_flag_values.textproto
new file mode 100644
index 0000000..d2ad420
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_contextual_tips_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_contextual_tips"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enable_efficient_display_repository_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enable_efficient_display_repository_flag_values.textproto
new file mode 100644
index 0000000..1c3b9e8
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enable_efficient_display_repository_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_efficient_display_repository"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto b/aconfig/ap4a/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto
new file mode 100644
index 0000000..81a9174
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/enforce_brightness_base_user_restriction_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enforce_brightness_base_user_restriction"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/face_message_defer_update_flag_values.textproto b/aconfig/ap4a/com.android.systemui/face_message_defer_update_flag_values.textproto
new file mode 100644
index 0000000..1b0c7a6
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/face_message_defer_update_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "face_message_defer_update"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/faster_unlock_transition_flag_values.textproto b/aconfig/ap4a/com.android.systemui/faster_unlock_transition_flag_values.textproto
new file mode 100644
index 0000000..6bb0149
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/faster_unlock_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "faster_unlock_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto b/aconfig/ap4a/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
new file mode 100644
index 0000000..40fdd5f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "fetch_bookmarks_xml_keyboard_shortcuts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto b/aconfig/ap4a/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto
new file mode 100644
index 0000000..e3cffc4
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/fix_image_wallpaper_crash_surface_already_released_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "fix_image_wallpaper_crash_surface_already_released"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto b/aconfig/ap4a/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto
new file mode 100644
index 0000000..55f9c0f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/fix_screenshot_action_dismiss_system_windows_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "fix_screenshot_action_dismiss_system_windows"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto b/aconfig/ap4a/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto
new file mode 100644
index 0000000..bce374c
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/floating_menu_drag_to_edit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "floating_menu_drag_to_edit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto b/aconfig/ap4a/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto
new file mode 100644
index 0000000..3aaabb7
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/floating_menu_narrow_target_content_observer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "floating_menu_narrow_target_content_observer"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto b/aconfig/ap4a/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto
new file mode 100644
index 0000000..a7fc3fc
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/get_connected_device_name_unsynchronized_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "get_connected_device_name_unsynchronized"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto b/aconfig/ap4a/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto
new file mode 100644
index 0000000..675ec1d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/hearing_aids_qs_tile_dialog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "hearing_aids_qs_tile_dialog"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto b/aconfig/ap4a/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto
new file mode 100644
index 0000000..f5cdca7
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/hearing_devices_dialog_related_tools_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "hearing_devices_dialog_related_tools"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/hubmode_fullscreen_vertical_swipe_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/hubmode_fullscreen_vertical_swipe_fix_flag_values.textproto
new file mode 100644
index 0000000..db8943b
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/hubmode_fullscreen_vertical_swipe_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "hubmode_fullscreen_vertical_swipe_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto b/aconfig/ap4a/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto
new file mode 100644
index 0000000..ea32822
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/ignore_touches_next_to_notification_shelf_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "ignore_touches_next_to_notification_shelf"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto
new file mode 100644
index 0000000..ca19354
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/keyguard_bottom_area_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "keyguard_bottom_area_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..b249a99
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/media_controls_lockscreen_shade_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_controls_lockscreen_shade_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/media_controls_posts_optimization_flag_values.textproto b/aconfig/ap4a/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
new file mode 100644
index 0000000..64fea10
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_controls_posts_optimization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto b/aconfig/ap4a/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto
new file mode 100644
index 0000000..d5cc180
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/media_controls_user_initiated_deleteintent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_controls_user_initiated_deleteintent"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto b/aconfig/ap4a/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
new file mode 100644
index 0000000..980a53b
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_load_metadata_via_media_data_loader"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto b/aconfig/ap4a/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
new file mode 100644
index 0000000..2333a33
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_lockscreen_launch_animation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto b/aconfig/ap4a/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto
new file mode 100644
index 0000000..5887d21
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/migrate_clocks_to_blueprint_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "migrate_clocks_to_blueprint"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/new_aod_transition_flag_values.textproto b/aconfig/ap4a/com.android.systemui/new_aod_transition_flag_values.textproto
new file mode 100644
index 0000000..30f9d40
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/new_aod_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "new_aod_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/new_volume_panel_flag_values.textproto b/aconfig/ap4a/com.android.systemui/new_volume_panel_flag_values.textproto
new file mode 100644
index 0000000..8e5eb2f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/new_volume_panel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "new_volume_panel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto
new file mode 100644
index 0000000..575c628
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_async_group_header_inflation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_async_group_header_inflation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto
new file mode 100644
index 0000000..2428807
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_async_hybrid_view_inflation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_async_hybrid_view_inflation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_background_tint_optimization_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_background_tint_optimization_flag_values.textproto
new file mode 100644
index 0000000..b0b6e97
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_background_tint_optimization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_background_tint_optimization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto
new file mode 100644
index 0000000..50b4400
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_media_manager_background_execution_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_media_manager_background_execution"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto
new file mode 100644
index 0000000..0eb9edb
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_over_expansion_clipping_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_over_expansion_clipping_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_pulsing_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_pulsing_fix_flag_values.textproto
new file mode 100644
index 0000000..4ef1f2a
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_pulsing_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_pulsing_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_row_user_context_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_row_user_context_flag_values.textproto
new file mode 100644
index 0000000..eb6c84b
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_row_user_context_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_row_user_context"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_transparent_header_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
new file mode 100644
index 0000000..5581e64
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_transparent_header_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto
new file mode 100644
index 0000000..96963a5
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notification_view_flipper_pausing_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_view_flipper_pausing_v2"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto
new file mode 100644
index 0000000..6002206
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notifications_footer_view_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notifications_footer_view_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto
new file mode 100644
index 0000000..c14dc2f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notifications_icon_container_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notifications_icon_container_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto
new file mode 100644
index 0000000..9dc4399
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notifications_improved_hun_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notifications_improved_hun_animation"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto
new file mode 100644
index 0000000..992b3f5
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/notify_power_manager_user_activity_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notify_power_manager_user_activity_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto b/aconfig/ap4a/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto
new file mode 100644
index 0000000..a0bba3f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/pin_input_field_styled_focus_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "pin_input_field_styled_focus_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto b/aconfig/ap4a/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto
new file mode 100644
index 0000000..c1af5fc
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/predictive_back_animate_bouncer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "predictive_back_animate_bouncer"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto b/aconfig/ap4a/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto
new file mode 100644
index 0000000..c9e383f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/predictive_back_animate_dialogs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "predictive_back_animate_dialogs"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/predictive_back_sysui_flag_values.textproto b/aconfig/ap4a/com.android.systemui/predictive_back_sysui_flag_values.textproto
new file mode 100644
index 0000000..24aed0a
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/predictive_back_sysui_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "predictive_back_sysui"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/priority_people_section_flag_values.textproto b/aconfig/ap4a/com.android.systemui/priority_people_section_flag_values.textproto
new file mode 100644
index 0000000..4a29cae
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/priority_people_section_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "priority_people_section"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto b/aconfig/ap4a/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto
new file mode 100644
index 0000000..62c0572
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/pss_app_selector_recents_split_screen_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "pss_app_selector_recents_split_screen"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..4cfd1f2
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/qs_custom_tile_click_guaranteed_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "qs_custom_tile_click_guaranteed_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto b/aconfig/ap4a/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
new file mode 100644
index 0000000..74d4ba4
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "qs_register_setting_observer_on_bg_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/qs_tile_focus_state_flag_values.textproto b/aconfig/ap4a/com.android.systemui/qs_tile_focus_state_flag_values.textproto
new file mode 100644
index 0000000..820a546
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/qs_tile_focus_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "qs_tile_focus_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto b/aconfig/ap4a/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto
new file mode 100644
index 0000000..4b16fa9
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/quick_settings_visual_haptics_longpress_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "quick_settings_visual_haptics_longpress"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/refactor_get_current_user_flag_values.textproto b/aconfig/ap4a/com.android.systemui/refactor_get_current_user_flag_values.textproto
new file mode 100644
index 0000000..483900e
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/refactor_get_current_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "refactor_get_current_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/register_content_observers_async_flag_values.textproto b/aconfig/ap4a/com.android.systemui/register_content_observers_async_flag_values.textproto
new file mode 100644
index 0000000..60ff41e
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/register_content_observers_async_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "register_content_observers_async"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto
new file mode 100644
index 0000000..5eb38ac
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/register_new_wallet_card_in_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "register_new_wallet_card_in_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto
new file mode 100644
index 0000000..5694fdc
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/register_wallpaper_notifier_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "register_wallpaper_notifier_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto
new file mode 100644
index 0000000..7b1c049
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/register_zen_mode_content_observer_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "register_zen_mode_content_observer_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto b/aconfig/ap4a/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
new file mode 100644
index 0000000..2f2d93a
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "relock_with_power_button_immediately"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto b/aconfig/ap4a/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto
new file mode 100644
index 0000000..bd35836
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/remove_dream_overlay_hide_on_touch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "remove_dream_overlay_hide_on_touch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto b/aconfig/ap4a/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
new file mode 100644
index 0000000..d70485d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "remove_update_listener_in_qs_icon_view_impl"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/revamped_bouncer_messages_flag_values.textproto b/aconfig/ap4a/com.android.systemui/revamped_bouncer_messages_flag_values.textproto
new file mode 100644
index 0000000..ff9cad0
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/revamped_bouncer_messages_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "revamped_bouncer_messages"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto b/aconfig/ap4a/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
new file mode 100644
index 0000000..7b33b41
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "save_and_restore_magnification_settings_buttons"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..1cf20d1
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/screenshare_notification_hiding_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "screenshare_notification_hiding_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto
new file mode 100644
index 0000000..98560c2
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/screenshot_scroll_crop_view_crash_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "screenshot_scroll_crop_view_crash_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto b/aconfig/ap4a/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
new file mode 100644
index 0000000..01ea661
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "settings_ext_register_content_observer_on_bg_thread"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto
new file mode 100644
index 0000000..d2b7697
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/shaderlib_loading_effect_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "shaderlib_loading_effect_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto b/aconfig/ap4a/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
new file mode 100644
index 0000000..8daf0f3
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sim_pin_race_condition_on_restart"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto b/aconfig/ap4a/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
new file mode 100644
index 0000000..9b7ff79
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sim_pin_talkback_fix_for_double_submit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto
new file mode 100644
index 0000000..add6dc8
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/slice_broadcast_relay_in_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "slice_broadcast_relay_in_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto
new file mode 100644
index 0000000..4d4ec5e
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/slice_manager_binder_call_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "slice_manager_binder_call_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto b/aconfig/ap4a/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto
new file mode 100644
index 0000000..acfcbf8
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/smartspace_lockscreen_viewmodel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "smartspace_lockscreen_viewmodel"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
new file mode 100644
index 0000000..fba5ad3
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "smartspace_remoteviews_rendering_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/sounddose_customization_flag_values.textproto b/aconfig/ap4a/com.android.systemui/sounddose_customization_flag_values.textproto
new file mode 100644
index 0000000..d2569ab
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/sounddose_customization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sounddose_customization"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
new file mode 100644
index 0000000..bbb231f
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_always_check_underlying_networks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
new file mode 100644
index 0000000..02c2f8a
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_call_chip_notification_icon"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto
new file mode 100644
index 0000000..7c9c077
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_monochrome_icons_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_monochrome_icons_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto
new file mode 100644
index 0000000..f428ab1
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_screen_sharing_chips_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_screen_sharing_chips"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
new file mode 100644
index 0000000..980b788
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_switch_to_spn_from_data_spn"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto b/aconfig/ap4a/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
new file mode 100644
index 0000000..bff290c
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_use_repos_for_call_chip"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/switch_user_on_bg_flag_values.textproto b/aconfig/ap4a/com.android.systemui/switch_user_on_bg_flag_values.textproto
new file mode 100644
index 0000000..4febb6b
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/switch_user_on_bg_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "switch_user_on_bg"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto b/aconfig/ap4a/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
new file mode 100644
index 0000000..c3361ad
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "translucent_occluding_activity_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/udfps_view_performance_flag_values.textproto b/aconfig/ap4a/com.android.systemui/udfps_view_performance_flag_values.textproto
new file mode 100644
index 0000000..07d0fc0
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/udfps_view_performance_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "udfps_view_performance"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/unfold_animation_background_progress_flag_values.textproto b/aconfig/ap4a/com.android.systemui/unfold_animation_background_progress_flag_values.textproto
new file mode 100644
index 0000000..a4a011b
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/unfold_animation_background_progress_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "unfold_animation_background_progress"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/update_user_switcher_background_flag_values.textproto b/aconfig/ap4a/com.android.systemui/update_user_switcher_background_flag_values.textproto
new file mode 100644
index 0000000..5472599
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/update_user_switcher_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "update_user_switcher_background"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto b/aconfig/ap4a/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
new file mode 100644
index 0000000..7378da9
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "use_transitions_for_keyguard_occluded"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/use_volume_controller_flag_values.textproto b/aconfig/ap4a/com.android.systemui/use_volume_controller_flag_values.textproto
new file mode 100644
index 0000000..a3eece8
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/use_volume_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "use_volume_controller"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto b/aconfig/ap4a/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto
new file mode 100644
index 0000000..a8e6c42
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/validate_keyboard_shortcut_helper_icon_uri_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "validate_keyboard_shortcut_helper_icon_uri"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.systemui/visual_interruptions_refactor_flag_values.textproto b/aconfig/ap4a/com.android.systemui/visual_interruptions_refactor_flag_values.textproto
new file mode 100644
index 0000000..a16448d
--- /dev/null
+++ b/aconfig/ap4a/com.android.systemui/visual_interruptions_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "visual_interruptions_refactor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/Android.bp b/aconfig/ap4a/com.android.text.flags/Android.bp
new file mode 100644
index 0000000..8c87323
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.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-platform_build_release-ap4a-com.android.text.flags-all",
+  package: "com.android.text.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto
new file mode 100644
index 0000000..fd313a8
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/complete_font_load_in_system_services_ready_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "complete_font_load_in_system_services_ready"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
new file mode 100644
index 0000000..b25564f
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "context_menu_hide_unavailable_items"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto
new file mode 100644
index 0000000..dbb7b4a
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/disable_handwriting_initiator_for_ime_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "disable_handwriting_initiator_for_ime"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/escape_clears_focus_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/escape_clears_focus_flag_values.textproto
new file mode 100644
index 0000000..e2da643
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/escape_clears_focus_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "escape_clears_focus"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto
new file mode 100644
index 0000000..6eb7c1f
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/fix_line_height_for_locale_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "fix_line_height_for_locale"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/handwriting_cursor_position_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/handwriting_cursor_position_flag_values.textproto
new file mode 100644
index 0000000..dd8c82f
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/handwriting_cursor_position_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "handwriting_cursor_position"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto
new file mode 100644
index 0000000..467702f
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/handwriting_end_of_line_tap_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "handwriting_end_of_line_tap"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto
new file mode 100644
index 0000000..efb3583
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/handwriting_unsupported_message_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "handwriting_unsupported_message"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
new file mode 100644
index 0000000..a39e0df
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "insert_mode_crash_update_layout_span"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto
new file mode 100644
index 0000000..d26df22
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/insert_mode_crash_when_delete_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "insert_mode_crash_when_delete"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/letter_spacing_justification_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/letter_spacing_justification_flag_values.textproto
new file mode 100644
index 0000000..af74cf5
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/letter_spacing_justification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "letter_spacing_justification"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto
new file mode 100644
index 0000000..162780c
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/new_fonts_fallback_xml_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "new_fonts_fallback_xml"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto
new file mode 100644
index 0000000..c155a68
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/no_break_no_hyphenation_span_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "no_break_no_hyphenation_span"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/use_bounds_for_width_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/use_bounds_for_width_flag_values.textproto
new file mode 100644
index 0000000..266b4e4
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/use_bounds_for_width_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "use_bounds_for_width"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto
new file mode 100644
index 0000000..7164a15
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/use_optimized_boottime_font_loading_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "use_optimized_boottime_font_loading"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.text.flags/word_style_auto_flag_values.textproto b/aconfig/ap4a/com.android.text.flags/word_style_auto_flag_values.textproto
new file mode 100644
index 0000000..3bb8ffd
--- /dev/null
+++ b/aconfig/ap4a/com.android.text.flags/word_style_auto_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "word_style_auto"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/Android.bp b/aconfig/ap4a/com.android.uwb.flags/Android.bp
new file mode 100644
index 0000000..ddefa56
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.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-platform_build_release-ap4a-com.android.uwb.flags-all",
+  package: "com.android.uwb.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto
new file mode 100644
index 0000000..7b06cbc
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/data_transfer_phase_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "data_transfer_phase_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/hw_state_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/hw_state_flag_values.textproto
new file mode 100644
index 0000000..50d34ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/hw_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "hw_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/hybrid_session_support_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/hybrid_session_support_flag_values.textproto
new file mode 100644
index 0000000..17e40d1
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/hybrid_session_support_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "hybrid_session_support"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto
new file mode 100644
index 0000000..6dc0d6d
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/query_timestamp_micros_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "query_timestamp_micros"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto
new file mode 100644
index 0000000..a1b9956
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/reason_inband_session_stop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "reason_inband_session_stop"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto b/aconfig/ap4a/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto
new file mode 100644
index 0000000..e49e7cf
--- /dev/null
+++ b/aconfig/ap4a/com.android.uwb.flags/use_uwbs_uci_version_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.uwb.flags"
+  name: "use_uwbs_uci_version"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wifi.flags/Android.bp b/aconfig/ap4a/com.android.wifi.flags/Android.bp
new file mode 100644
index 0000000..ecdc5bf
--- /dev/null
+++ b/aconfig/ap4a/com.android.wifi.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-platform_build_release-ap4a-com.android.wifi.flags-all",
+  package: "com.android.wifi.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto b/aconfig/ap4a/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto
new file mode 100644
index 0000000..49e2ff8
--- /dev/null
+++ b/aconfig/ap4a/com.android.wifi.flags/android_v_wifi_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "android_v_wifi_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto b/aconfig/ap4a/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
new file mode 100644
index 0000000..729f551
--- /dev/null
+++ b/aconfig/ap4a/com.android.wifi.flags/network_provider_battery_charging_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "network_provider_battery_charging_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto b/aconfig/ap4a/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto
new file mode 100644
index 0000000..063f6ee
--- /dev/null
+++ b/aconfig/ap4a/com.android.wifi.flags/shared_connectivity_broadcast_receiver_test_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "shared_connectivity_broadcast_receiver_test_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/Android.bp b/aconfig/ap4a/com.android.window.flags/Android.bp
new file mode 100644
index 0000000..efc629c
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.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-platform_build_release-ap4a-com.android.window.flags-all",
+  package: "com.android.window.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
new file mode 100644
index 0000000..0b6ffc6
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "activity_embedding_animation_customization_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto
new file mode 100644
index 0000000..119c8c9
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/activity_embedding_interactive_divider_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "activity_embedding_interactive_divider_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto
new file mode 100644
index 0000000..c522d16
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/activity_embedding_overlay_presentation_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "activity_embedding_overlay_presentation_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
new file mode 100644
index 0000000..731e912
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/allow_disable_activity_record_input_sink_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "allow_disable_activity_record_input_sink"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/allow_hide_scm_button_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/allow_hide_scm_button_flag_values.textproto
new file mode 100644
index 0000000..63fb0f2
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/allow_hide_scm_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "allow_hide_scm_button"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
new file mode 100644
index 0000000..5901751
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/allows_screen_size_decoupled_from_status_bar_and_cutout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "allows_screen_size_decoupled_from_status_bar_and_cutout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto
new file mode 100644
index 0000000..9db0b22
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/always_draw_magnification_fullscreen_border_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "always_draw_magnification_fullscreen_border"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto
new file mode 100644
index 0000000..a692469
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/always_update_wallpaper_permission_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "always_update_wallpaper_permission"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/app_compat_properties_api_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/app_compat_properties_api_flag_values.textproto
new file mode 100644
index 0000000..10b67f3
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/app_compat_properties_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "app_compat_properties_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
new file mode 100644
index 0000000..7a85bc6
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "avoid_rebinding_intentionally_disconnected_wallpaper"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto
new file mode 100644
index 0000000..88b42bf
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/bal_dont_bring_existing_background_task_stack_to_fg_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_dont_bring_existing_background_task_stack_to_fg"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto
new file mode 100644
index 0000000..f3efafe
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/bal_improve_real_caller_visibility_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_improve_real_caller_visibility_check"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto
new file mode 100644
index 0000000..016dbda
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/bal_require_opt_in_by_pending_intent_creator_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_require_opt_in_by_pending_intent_creator"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto
new file mode 100644
index 0000000..ee6ec86
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/bal_respect_app_switch_state_when_check_bound_by_foreground_uid_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_respect_app_switch_state_when_check_bound_by_foreground_uid"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto
new file mode 100644
index 0000000..ea9c890
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/blast_sync_notification_shade_on_display_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "blast_sync_notification_shade_on_display_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/configurable_font_scale_default_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/configurable_font_scale_default_flag_values.textproto
new file mode 100644
index 0000000..5ee28b2
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/configurable_font_scale_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "configurable_font_scale_default"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/cover_display_opt_in_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/cover_display_opt_in_flag_values.textproto
new file mode 100644
index 0000000..d1a3f7f
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/cover_display_opt_in_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "cover_display_opt_in"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto
new file mode 100644
index 0000000..0300be5
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/delay_notification_to_magnification_when_recents_window_to_front_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "delay_notification_to_magnification_when_recents_window_to_front_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto
new file mode 100644
index 0000000..beac1ec
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/delegate_unhandled_drags_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "delegate_unhandled_drags"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/delete_capture_display_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/delete_capture_display_flag_values.textproto
new file mode 100644
index 0000000..0ba4ddd
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/delete_capture_display_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "delete_capture_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/density_390_api_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/density_390_api_flag_values.textproto
new file mode 100644
index 0000000..aaa7399
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/density_390_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "density_390_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto
new file mode 100644
index 0000000..49407fe
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/disable_thin_letterboxing_policy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "disable_thin_letterboxing_policy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
new file mode 100644
index 0000000..a49224c
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "draw_snapshot_aspect_ratio_match"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto
new file mode 100644
index 0000000..d214bfd
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/enable_buffer_transform_hint_from_display_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_buffer_transform_hint_from_display"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto
new file mode 100644
index 0000000..ef54789
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/enable_wm_extensions_for_all_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_wm_extensions_for_all_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto
new file mode 100644
index 0000000..04067c1
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/enforce_edge_to_edge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enforce_edge_to_edge"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto
new file mode 100644
index 0000000..4cbbf1d
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/explicit_refresh_rate_hints_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "explicit_refresh_rate_hints"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto
new file mode 100644
index 0000000..785d67a
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/get_dimmer_on_closing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "get_dimmer_on_closing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/immersive_app_repositioning_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/immersive_app_repositioning_flag_values.textproto
new file mode 100644
index 0000000..350f268
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/immersive_app_repositioning_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "immersive_app_repositioning"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/insets_control_seq_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/insets_control_seq_flag_values.textproto
new file mode 100644
index 0000000..565d166
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/insets_control_seq_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "insets_control_seq"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto
new file mode 100644
index 0000000..a713b69
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/insets_decoupled_configuration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "insets_decoupled_configuration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
new file mode 100644
index 0000000..f1acd32
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "migrate_predictive_back_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/movable_cutout_configuration_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/movable_cutout_configuration_flag_values.textproto
new file mode 100644
index 0000000..a552fbe
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/movable_cutout_configuration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "movable_cutout_configuration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/move_animation_options_to_change_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/move_animation_options_to_change_flag_values.textproto
new file mode 100644
index 0000000..7f23696
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/move_animation_options_to_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "move_animation_options_to_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/multi_crop_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/multi_crop_flag_values.textproto
new file mode 100644
index 0000000..2c658ff
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/multi_crop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "multi_crop"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto
new file mode 100644
index 0000000..6eba610
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/no_consecutive_visibility_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "no_consecutive_visibility_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
new file mode 100644
index 0000000..d898a8b
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "no_duplicate_surface_destroyed_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto
new file mode 100644
index 0000000..51198c7
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/no_visibility_event_on_display_state_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "no_visibility_event_on_display_state_change"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/predictive_back_system_anims_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/predictive_back_system_anims_flag_values.textproto
new file mode 100644
index 0000000..522a11c
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/predictive_back_system_anims_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "predictive_back_system_anims"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
new file mode 100644
index 0000000..9d6195f
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "process_priority_policy_for_multi_window_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto
new file mode 100644
index 0000000..fcfe928
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/rear_display_disable_force_desktop_system_decorations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "rear_display_disable_force_desktop_system_decorations"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
new file mode 100644
index 0000000..efb69dc
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "respect_orientation_change_for_unresizeable"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/screen_recording_callbacks_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/screen_recording_callbacks_flag_values.textproto
new file mode 100644
index 0000000..7ec4241
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/screen_recording_callbacks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "screen_recording_callbacks"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/sdk_desired_present_time_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/sdk_desired_present_time_flag_values.textproto
new file mode 100644
index 0000000..a64959e
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/sdk_desired_present_time_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "sdk_desired_present_time"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/secure_window_state_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/secure_window_state_flag_values.textproto
new file mode 100644
index 0000000..a486c16
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/secure_window_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "secure_window_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
new file mode 100644
index 0000000..105323b
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "show_desktop_windowing_dev_option"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto
new file mode 100644
index 0000000..ee4588a
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/supports_multi_instance_system_ui_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "supports_multi_instance_system_ui"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/surface_control_input_receiver_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/surface_control_input_receiver_flag_values.textproto
new file mode 100644
index 0000000..03b2206
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/surface_control_input_receiver_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "surface_control_input_receiver"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
new file mode 100644
index 0000000..dff3478
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/surface_trusted_overlay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "surface_trusted_overlay"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/sync_screen_capture_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/sync_screen_capture_flag_values.textproto
new file mode 100644
index 0000000..8df667e
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/sync_screen_capture_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "sync_screen_capture"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
new file mode 100644
index 0000000..17a43a3
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "system_ui_immersive_confirmation_dialog"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto
new file mode 100644
index 0000000..daca03a
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/task_fragment_system_organizer_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "task_fragment_system_organizer_flag"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto
new file mode 100644
index 0000000..8c80d11
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/trusted_presentation_listener_for_window_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "trusted_presentation_listener_for_window"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto
new file mode 100644
index 0000000..42c55e4
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/untrusted_embedding_state_sharing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "untrusted_embedding_state_sharing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/use_tasks_dim_only_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
new file mode 100644
index 0000000..80074b5
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "use_tasks_dim_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto
new file mode 100644
index 0000000..2f3151d
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/user_min_aspect_ratio_app_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "user_min_aspect_ratio_app_default"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto
new file mode 100644
index 0000000..423bfa2
--- /dev/null
+++ b/aconfig/ap4a/com.android.window.flags/wait_for_transition_on_display_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "wait_for_transition_on_display_switch"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto b/aconfig/ap4a/com.android.window.flags/wallpaper_offset_async_flag_values.textproto
new file mode 100644
index 0000000..8736ae3
--- /dev/null
+++ b/aconfig/ap4a/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/ap4a/com.android.wm.shell/Android.bp b/aconfig/ap4a/com.android.wm.shell/Android.bp
new file mode 100644
index 0000000..7b77049
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/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-platform_build_release-ap4a-com.android.wm.shell-all",
+  package: "com.android.wm.shell",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
new file mode 100644
index 0000000..ab12962
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "bubble_view_info_executors"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/enable_app_pairs_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/enable_app_pairs_flag_values.textproto
new file mode 100644
index 0000000..fa936d1
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/enable_app_pairs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_app_pairs"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto
new file mode 100644
index 0000000..e0ff2f7
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/enable_left_right_split_in_portrait_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_left_right_split_in_portrait"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/enable_split_contextual_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/enable_split_contextual_flag_values.textproto
new file mode 100644
index 0000000..cbf4d59
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/enable_split_contextual_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_split_contextual"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/enable_taskbar_navbar_unification_flag_values.textproto
new file mode 100644
index 0000000..7486856
--- /dev/null
+++ b/aconfig/ap4a/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: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto b/aconfig/ap4a/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
new file mode 100644
index 0000000..80c03cc
--- /dev/null
+++ b/aconfig/ap4a/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "only_reuse_bubbled_task_when_launched_from_bubble"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/Android.bp b/aconfig/ap4a/com.google.android.iwlan.flags/Android.bp
new file mode 100644
index 0000000..41d76c5
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.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-platform_build_release-ap4a-com.google.android.iwlan.flags-all",
+  package: "com.google.android.iwlan.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto b/aconfig/ap4a/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto
new file mode 100644
index 0000000..1755517
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.flags/aead_algos_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "aead_algos_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto b/aconfig/ap4a/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto
new file mode 100644
index 0000000..2b6ba75
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.flags/epdg_selection_exclude_failed_ip_address_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "epdg_selection_exclude_failed_ip_address"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto b/aconfig/ap4a/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto
new file mode 100644
index 0000000..79f691d
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.flags/high_secure_transforms_prioritized_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "high_secure_transforms_prioritized"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto b/aconfig/ap4a/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto
new file mode 100644
index 0000000..b9b5484
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.flags/multiple_sa_proposals_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "multiple_sa_proposals"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto b/aconfig/ap4a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
new file mode 100644
index 0000000..fd95116
--- /dev/null
+++ b/aconfig/ap4a/com.google.android.iwlan.flags/prevent_epdg_selection_threads_exhausted_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "prevent_epdg_selection_threads_exhausted"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/ap4a/vendor.vibrator.hal.flags/Android.bp b/aconfig/ap4a/vendor.vibrator.hal.flags/Android.bp
new file mode 100644
index 0000000..a23f4b0
--- /dev/null
+++ b/aconfig/ap4a/vendor.vibrator.hal.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-platform_build_release-ap4a-vendor.vibrator.hal.flags-all",
+  package: "vendor.vibrator.hal.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/ap4a/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto b/aconfig/ap4a/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto
new file mode 100644
index 0000000..6119c84
--- /dev/null
+++ b/aconfig/ap4a/vendor.vibrator.hal.flags/remove_capo_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "vendor.vibrator.hal.flags"
+  name: "remove_capo"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/Android.bp b/aconfig/trunk_staging/Android.bp
index 2ec4639..2f36c6e 100644
--- a/aconfig/trunk_staging/Android.bp
+++ b/aconfig/trunk_staging/Android.bp
@@ -15,173 +15,189 @@
 aconfig_value_set {
     name: "aconfig_value_set-platform_build_release-trunk_staging",
     values: [
-      "aconfig-values-platform_build_release-trunk_staging-android.service.notification-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.content.pm-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.contactkeys.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.foldables.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.nearby.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.wearable-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.net.platform.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.credentials.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.batterysaver-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.widget.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.security.flag-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.media.audiopolicy-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.service.voice.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.permission.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.art.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.companion.virtual-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig_new_storage-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.wm.shell-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.input-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.performance.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.nfc-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.tracing-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.nci.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.view.inputmethod-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.media.tv.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audio-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.factory_reset-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.google.android.iwlan.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioclient-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.contextualsearch.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.database.sqlite-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.os.vibrator-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.media.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.libsensor.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.intentresolver-all",
       "aconfig-values-platform_build_release-trunk_staging-com.android.frameworks.sensorservice.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.hardware.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.net.wifi.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.content.res-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.view.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.camera.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.net-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.provider-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.feature.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtualdevice.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy.feature.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.test-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.location.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.platform.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.appsearch.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.bluetooth.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.webkit-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.adservices.ondevicepersonalization.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.service.appprediction.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.text.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.chre.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.net.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.wifi.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.service.chooser-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.usage-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.content.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.deviceaswebcam.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.adaptiveauth-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.btaudio.hal.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.job-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.crashrecovery.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.service.autofill-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.aaudio-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.permission.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.media.audio-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.security-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.multiuser-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.admin.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.am-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.appwidget.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.graphics.pdf.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.mainline.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.development-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.optimization-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.server-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.shared-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.feature.flags-all",
       "aconfig-values-platform_build_release-trunk_staging-android.net.vcn-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.companion-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.codec.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.wallpaper-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceconfig-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.accessibility-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.car-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.service.controls.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.settings-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.healthconnect.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.ondeviceintelligence.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.accessibility-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.system.virtualmachine.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.stats-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.view.contentcapture.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.utils-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioserver-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.notification-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.hint-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.example.android.aconfig.demo.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.car.carlauncher-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.hardware.biometrics-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.server.app-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.media.midi-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.view.contentprotection.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.os.profiling-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.biometrics-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.editing.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.hardware.radio-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.hardware.usb.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.icu-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.egg.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.backup-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.view.accessibility-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.car.settings-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.compat.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.usb.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.bluetooth.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.performance.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.platform.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.am-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.wearable-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.net.flags-all",
       "aconfig-values-platform_build_release-trunk_staging-vendor.vibrator.hal.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.dreams-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.media.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.usage-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.libcore-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.telecom.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.projection.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.os-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.sdksandbox.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.playback.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.telephony.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.launcher3-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.window.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.speech.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.media.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.uwb.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.car.datasubscription-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.media_drm-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.chooser-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.libsensor.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.healthfitness.flags-all",
       "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libgui.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.smartspace.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtual.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.car.dockutil-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.car.feature-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.org.conscrypt-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.chre.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.mainline.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.usage-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.adaptiveauth-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.provider.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.notification-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.appfunctions.flags-all",
       "aconfig-values-platform_build_release-trunk_staging-android.os-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.hardware.devicestate.feature.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.ipsec.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.app.job-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.biometrics-all",
       "aconfig-values-platform_build_release-trunk_staging-android.media.codec-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.radio-all",
       "aconfig-values-platform_build_release-trunk_staging-android.service.dreams-all",
-      "aconfig-values-platform_build_release-trunk_staging-android.security.keystore2-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.security-all",
       "aconfig-values-platform_build_release-trunk_staging-com.android.adservices.flags-all",
-      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.hwui.flags-all"
+      "aconfig-values-platform_build_release-trunk_staging-android.security.flag-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.egg.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.admin.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.net.wifi.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.media_drm-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.server-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.usb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.input-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.pm-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.icu-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.voice.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.btaudio.hal.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.webkit-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.job-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.net.ct.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.ondeviceintelligence.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.appwidget.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.autofill-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig_new_storage-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.sdk-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.inputmethod-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.test-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.managedprovisioning.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.editing.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wm.shell-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.controls.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.backup-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.location.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.appsearch.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.security.keystore2-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.codec.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.usb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wifi.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.smartspace.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.car.dockutil-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.sdksandbox.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.os.vibrator-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.devicestate.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.launcher3-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioclient-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.os-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.speech.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.updates-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.stats-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.car.carlauncher-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtualdevice.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.database.sqlite-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.net.thread.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.crashrecovery.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.system.virtualmachine.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.os.profiling-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.car.settings-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.contentcapture.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.job-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.contactkeys.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wallpaper-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.hint-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.settings-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.telephony.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.biometrics-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.trunk_stable_workflow_testing-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.usage-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.foldables.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.text.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.audio-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceconfig-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.media.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.dreams-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.uprobestats.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.provider-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.tv.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.art.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.aaudio-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.projection.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.hwui.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.appprediction.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-libgooglecamerahal.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.deviceaswebcam.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.multiuser-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.intentresolver-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.factory_reset-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.graphics.pdf.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.credentials.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.permission.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.playback.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.notification-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.libcore-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.audiopolicy-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.camera.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtual.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.widget.selectorwithwidgetpreference.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.ipsec.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.compat.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.healthconnect.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceidle-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.contextualsearch.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.car-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.google.android.iwlan.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.telecom.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.uwb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.window.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.res-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libvulkan.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.midi-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.adservices.ondevicepersonalization.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.utils-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.example.android.aconfig.demo.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.widget.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audio-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.car.feature-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.car.datasubscription-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.os.statsd.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioserver-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.batterysaver-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.net.platform.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.tracing-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.nci.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.optimization-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.media.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.nearby.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.nfc-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.server.app-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.net-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.soundtrigger-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.permission.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.powerstats-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.development-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.contentprotection.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.shared-all"
     ]
 }
diff --git a/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto
deleted file mode 100644
index baa7848..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/allow_screen_brightness_control_on_cope_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "allow_screen_brightness_control_on_cope"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto
deleted file mode 100644
index 198ad9d..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/always_persist_do_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "always_persist_do"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto
deleted file mode 100644
index 599537c..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/coexistence_migration_for_non_emm_management_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "coexistence_migration_for_non_emm_management_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto
deleted file mode 100644
index 671b5b3..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/copy_account_with_retry_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "copy_account_with_retry_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto
deleted file mode 100644
index 9ac9ca3..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dedicated_device_control_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dedicated_device_control_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto
deleted file mode 100644
index 1de347c..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/device_policy_size_tracking_internal_bug_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "device_policy_size_tracking_internal_bug_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto
deleted file mode 100644
index cd7174a..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/disallow_user_control_bg_usage_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "disallow_user_control_bg_usage_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto
deleted file mode 100644
index 0216490..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dmrh_set_app_restrictions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dmrh_set_app_restrictions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
new file mode 100644
index 0000000..8f7592e
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.admin.flags/dont_read_policy_definition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "dont_read_policy_definition"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto
deleted file mode 100644
index abb3da1..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/dumpsys_policy_engine_migration_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "dumpsys_policy_engine_migration_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto
new file mode 100644
index 0000000..e8dd71f
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.admin.flags/fix_race_condition_in_tie_profile_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "fix_race_condition_in_tie_profile_lock"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto
deleted file mode 100644
index f75e493..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_delegate_security_logging_bug_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_device_owner_delegate_security_logging_bug_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto
deleted file mode 100644
index 60b012f..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_device_owner_provisioning_fix_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_device_owner_provisioning_fix_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto
deleted file mode 100644
index b8ebbd8..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_bad_device_admin_state_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_bad_device_admin_state_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto
deleted file mode 100644
index 970769a..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_compatibility_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_compatibility_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto
deleted file mode 100644
index 6f5fb05..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/headless_single_user_fixes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "headless_single_user_fixes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto
deleted file mode 100644
index ae16913..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/hsum_unlock_notification_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "hsum_unlock_notification_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
new file mode 100644
index 0000000..adbb0a4
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.admin.flags/management_mode_policy_metrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "management_mode_policy_metrics"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto
deleted file mode 100644
index 50e5222..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/permission_migration_for_zero_trust_impl_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "permission_migration_for_zero_trust_impl_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto
deleted file mode 100644
index fda919d..0000000
--- a/aconfig/trunk_staging/android.app.admin.flags/power_exemption_bg_usage_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.app.admin.flags"
-  name: "power_exemption_bg_usage_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto b/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
new file mode 100644
index 0000000..aa80735
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.admin.flags/provisioning_context_parameter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.admin.flags"
+  name: "provisioning_context_parameter"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app.appfunctions.flags/Android.bp b/aconfig/trunk_staging/android.app.appfunctions.flags/Android.bp
new file mode 100644
index 0000000..7294451
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.appfunctions.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-platform_build_release-trunk_staging-android.app.appfunctions.flags-all",
+  package: "android.app.appfunctions.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto b/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto
new file mode 100644
index 0000000..917e76b
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.appfunctions.flags/enable_app_function_manager_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.appfunctions.flags"
+  name: "enable_app_function_manager"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app.job/cleanup_empty_jobs_flag_values.textproto b/aconfig/trunk_staging/android.app.job/cleanup_empty_jobs_flag_values.textproto
new file mode 100644
index 0000000..bb56935
--- /dev/null
+++ b/aconfig/trunk_staging/android.app.job/cleanup_empty_jobs_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app.job"
+  name: "cleanup_empty_jobs"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto b/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto
new file mode 100644
index 0000000..521b93d
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/cache_get_current_user_id_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "cache_get_current_user_id"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto
new file mode 100644
index 0000000..eb40be7
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/modes_ui_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "modes_ui"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto
new file mode 100644
index 0000000..50cba9b
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/modes_ui_icons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "modes_ui_icons"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app/modes_ui_test_flag_values.textproto b/aconfig/trunk_staging/android.app/modes_ui_test_flag_values.textproto
new file mode 100644
index 0000000..1ed2865
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/modes_ui_test_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "modes_ui_test"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto b/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
new file mode 100644
index 0000000..7b0fbc3
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/notif_channel_crop_vibration_effects_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "notif_channel_crop_vibration_effects"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto
new file mode 100644
index 0000000..27c2628
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/rate_limit_get_memory_info_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_memory_info"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto
new file mode 100644
index 0000000..b08b226
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/rate_limit_get_my_memory_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_my_memory_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
new file mode 100644
index 0000000..460150d
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/rate_limit_get_processes_in_error_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_processes_in_error_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto b/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto
new file mode 100644
index 0000000..086791c
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/rate_limit_get_running_app_processes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "rate_limit_get_running_app_processes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto b/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto
new file mode 100644
index 0000000..d433127
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/skip_bg_mem_trim_on_fg_app_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "skip_bg_mem_trim_on_fg_app"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto b/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto
new file mode 100644
index 0000000..41b4293
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/use_app_info_not_launched_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "use_app_info_not_launched"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto b/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto
new file mode 100644
index 0000000..8ae9f5e
--- /dev/null
+++ b/aconfig/trunk_staging/android.app/visit_person_uri_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.app"
+  name: "visit_person_uri"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto b/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto
new file mode 100644
index 0000000..d17b305
--- /dev/null
+++ b/aconfig/trunk_staging/android.appwidget.flags/remote_views_proto_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.appwidget.flags"
+  name: "remote_views_proto"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
new file mode 100644
index 0000000..7facb99
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/audio_vendor_freeze_improvements_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "audio_vendor_freeze_improvements"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto
new file mode 100644
index 0000000..3beffb1
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/car_input_start_btpairing_lptt_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_input_start_btpairing_lptt"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto
new file mode 100644
index 0000000..d72b31d
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/car_power_cancel_shell_command_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "car_power_cancel_shell_command"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto
new file mode 100644
index 0000000..c4a90e1
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/create_car_use_notifications_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "create_car_use_notifications"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto
new file mode 100644
index 0000000..fb8c9d1
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/handle_property_events_in_binder_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "handle_property_events_in_binder_thread"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto
new file mode 100644
index 0000000..27cff08
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/multi_display_brightness_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "multi_display_brightness_control"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
new file mode 100644
index 0000000..cc606ee
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/package_manager_extensions_for_sdv_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "package_manager_extensions_for_sdv"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto
new file mode 100644
index 0000000..554d631
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/stop_process_before_suspend_to_disk_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "stop_process_before_suspend_to_disk"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto
new file mode 100644
index 0000000..6bb0a3c
--- /dev/null
+++ b/aconfig/trunk_staging/android.car.feature/visible_background_user_restrictions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.car.feature"
+  name: "visible_background_user_restrictions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
new file mode 100644
index 0000000..b751528
--- /dev/null
+++ b/aconfig/trunk_staging/android.chre.flags/bug_fix_hal_reliable_message_record_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "bug_fix_hal_reliable_message_record"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto
new file mode 100644
index 0000000..4f68a4f
--- /dev/null
+++ b/aconfig/trunk_staging/android.chre.flags/fix_api_check_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "fix_api_check"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
deleted file mode 100644
index 5b54775..0000000
--- a/aconfig/trunk_staging/android.chre.flags/flag_log_nanoapp_load_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "flag_log_nanoapp_load_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
deleted file mode 100644
index e5e50f3..0000000
--- a/aconfig/trunk_staging/android.chre.flags/metrics_reporter_in_the_daemon_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "metrics_reporter_in_the_daemon"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
new file mode 100644
index 0000000..a05d223
--- /dev/null
+++ b/aconfig/trunk_staging/android.chre.flags/reconnect_host_endpoints_after_hal_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reconnect_host_endpoints_after_hal_restart"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto
new file mode 100644
index 0000000..68e5cd8
--- /dev/null
+++ b/aconfig/trunk_staging/android.chre.flags/refactor_hal_xport_agnostic_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "refactor_hal_xport_agnostic"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
new file mode 100644
index 0000000..6875460
--- /dev/null
+++ b/aconfig/trunk_staging/android.chre.flags/reliable_message_retry_support_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.chre.flags"
+  name: "reliable_message_retry_support_service"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto b/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto
deleted file mode 100644
index a677799..0000000
--- a/aconfig/trunk_staging/android.chre.flags/remove_ap_wakeup_metric_report_limit_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.chre.flags"
-  name: "remove_ap_wakeup_metric_report_limit"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto
deleted file mode 100644
index 6d284a3..0000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/consistent_display_flags_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "consistent_display_flags"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto
deleted file mode 100644
index 8d44be5..0000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/express_metrics_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "express_metrics"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto
deleted file mode 100644
index c826b8f..0000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/interactive_screen_mirror_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "interactive_screen_mirror"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto
deleted file mode 100644
index 206962f..0000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/intercept_intents_before_applying_policy_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "intercept_intents_before_applying_policy"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto
deleted file mode 100644
index 15b8a85..0000000
--- a/aconfig/trunk_staging/android.companion.virtual.flags/stream_permissions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtual.flags"
-  name: "stream_permissions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto
new file mode 100644
index 0000000..adb1006
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/activity_control_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "activity_control_api"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto
new file mode 100644
index 0000000..eaae37a
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/camera_timestamp_from_surface_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "camera_timestamp_from_surface"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto
new file mode 100644
index 0000000..fc00606
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/device_aware_display_power_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "device_aware_display_power"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto
new file mode 100644
index 0000000..8ae10ee
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/display_power_manager_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "display_power_manager_apis"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto
new file mode 100644
index 0000000..0f78512
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/enforce_remote_device_opt_out_on_all_virtual_displays_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "enforce_remote_device_opt_out_on_all_virtual_displays"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto
new file mode 100644
index 0000000..05fa8d6
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/high_resolution_scroll_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "high_resolution_scroll"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto
deleted file mode 100644
index c1bd30e..0000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/intent_interception_action_matching_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "intent_interception_action_matching_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
new file mode 100644
index 0000000..8ca4fb8
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/media_projection_keyguard_restrictions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "media_projection_keyguard_restrictions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto
deleted file mode 100644
index ff413d9..0000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/metrics_collection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "metrics_collection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto
new file mode 100644
index 0000000..b7f3219
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/status_bar_and_insets_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "status_bar_and_insets"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto
new file mode 100644
index 0000000..d6105d8
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_insets_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "virtual_display_insets"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto
deleted file mode 100644
index 88a72cb..0000000
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_multi_window_mode_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion.virtualdevice.flags"
-  name: "virtual_display_multi_window_mode_support"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto
new file mode 100644
index 0000000..f451dda
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_display_rotation_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "virtual_display_rotation_api"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto
new file mode 100644
index 0000000..94db58a
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/virtual_rotary_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion.virtualdevice.flags"
+  name: "virtual_rotary"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto b/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto
new file mode 100644
index 0000000..b5ad883
--- /dev/null
+++ b/aconfig/trunk_staging/android.companion/association_failure_code_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.companion"
+  name: "association_failure_code"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto b/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto
deleted file mode 100644
index 38effba..0000000
--- a/aconfig/trunk_staging/android.companion/companion_transport_apis_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.companion"
-  name: "companion_transport_apis"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto
new file mode 100644
index 0000000..1655ed1
--- /dev/null
+++ b/aconfig/trunk_staging/android.content.pm/get_package_info_with_fd_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "get_package_info_with_fd"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.content.pm/get_packages_from_launcher_apps_flag_values.textproto b/aconfig/trunk_staging/android.content.pm/get_packages_from_launcher_apps_flag_values.textproto
new file mode 100644
index 0000000..31e024a
--- /dev/null
+++ b/aconfig/trunk_staging/android.content.pm/get_packages_from_launcher_apps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.pm"
+  name: "get_packages_from_launcher_apps"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto b/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto
new file mode 100644
index 0000000..1ad57c6
--- /dev/null
+++ b/aconfig/trunk_staging/android.content.res/handle_all_config_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.content.res"
+  name: "handle_all_config_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
new file mode 100644
index 0000000..f0b4e25
--- /dev/null
+++ b/aconfig/trunk_staging/android.crashrecovery.flags/deprecate_flags_and_settings_resets_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.crashrecovery.flags"
+  name: "deprecate_flags_and_settings_resets"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto b/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto
new file mode 100644
index 0000000..51c898c
--- /dev/null
+++ b/aconfig/trunk_staging/android.crashrecovery.flags/enable_crashrecovery_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.crashrecovery.flags"
+  name: "enable_crashrecovery"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto b/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
new file mode 100644
index 0000000..aa78c4a
--- /dev/null
+++ b/aconfig/trunk_staging/android.hardware.biometrics/mandatory_biometrics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.biometrics"
+  name: "mandatory_biometrics"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto
new file mode 100644
index 0000000..a81e323
--- /dev/null
+++ b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_property_migration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.devicestate.feature.flags"
+  name: "device_state_property_migration"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
new file mode 100644
index 0000000..0bf8cc0
--- /dev/null
+++ b/aconfig/trunk_staging/android.hardware.devicestate.feature.flags/device_state_requester_cancel_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.devicestate.feature.flags"
+  name: "device_state_requester_cancel_state"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto
new file mode 100644
index 0000000..7c917c8
--- /dev/null
+++ b/aconfig/trunk_staging/android.hardware.usb.flags/enable_usb_sysfs_midi_identification_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.hardware.usb.flags"
+  name: "enable_usb_sysfs_midi_identification"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto
new file mode 100644
index 0000000..ae54f61
--- /dev/null
+++ b/aconfig/trunk_staging/android.location.flags/deprecate_provider_request_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "deprecate_provider_request_apis"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto
new file mode 100644
index 0000000..53ccaab
--- /dev/null
+++ b/aconfig/trunk_staging/android.location.flags/disable_stationary_throttling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "disable_stationary_throttling"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto
new file mode 100644
index 0000000..d0fbae3
--- /dev/null
+++ b/aconfig/trunk_staging/android.location.flags/enable_ni_supl_message_injection_by_carrier_config_bugfix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.location.flags"
+  name: "enable_ni_supl_message_injection_by_carrier_config_bugfix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto b/aconfig/trunk_staging/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto
deleted file mode 100644
index 8bf05c0..0000000
--- a/aconfig/trunk_staging/android.location.flags/gnss_call_stop_before_set_position_mode_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.location.flags"
-  name: "gnss_call_stop_before_set_position_mode"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto
new file mode 100644
index 0000000..c9b2458
--- /dev/null
+++ b/aconfig/trunk_staging/android.media.audio/enable_ringtone_haptics_customization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "enable_ringtone_haptics_customization"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto b/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto
new file mode 100644
index 0000000..3672d82
--- /dev/null
+++ b/aconfig/trunk_staging/android.media.audio/muted_by_port_volume_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.audio"
+  name: "muted_by_port_volume_api"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto b/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto
new file mode 100644
index 0000000..c54f2b8
--- /dev/null
+++ b/aconfig/trunk_staging/android.media.codec/thumbnail_block_model_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.codec"
+  name: "thumbnail_block_model"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.media.soundtrigger/Android.bp b/aconfig/trunk_staging/android.media.soundtrigger/Android.bp
new file mode 100644
index 0000000..87c4cc8
--- /dev/null
+++ b/aconfig/trunk_staging/android.media.soundtrigger/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-platform_build_release-trunk_staging-android.media.soundtrigger-all",
+  package: "android.media.soundtrigger",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto b/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto
new file mode 100644
index 0000000..9c64521
--- /dev/null
+++ b/aconfig/trunk_staging/android.media.soundtrigger/manager_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.media.soundtrigger"
+  name: "manager_api"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
new file mode 100644
index 0000000..c61f292
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/add_ui_for_sounds_from_background_users_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "add_ui_for_sounds_from_background_users"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto
new file mode 100644
index 0000000..a7a5868
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/cache_quiet_mode_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_quiet_mode_state"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto
new file mode 100644
index 0000000..77e26db
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_user_serial_number"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
new file mode 100644
index 0000000..1d985e1
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/cache_user_serial_number_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "cache_user_serial_number_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
new file mode 100644
index 0000000..1cfea6e
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/caches_not_invalidated_at_start_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "caches_not_invalidated_at_start_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto
new file mode 100644
index 0000000..edd8b27
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/caching_development_improvements_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "caching_development_improvements"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
new file mode 100644
index 0000000..39778ee
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_avatar_concurrent_file_write_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_concurrent_file_write"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto
new file mode 100644
index 0000000..61799e9
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_avatar_cross_user_leak_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_cross_user_leak"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
new file mode 100644
index 0000000..bf01f22
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_avatar_picker_not_responding_for_new_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_avatar_picker_not_responding_for_new_user"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
new file mode 100644
index 0000000..3a98c88
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_disabling_of_mu_toggle_when_restriction_applied_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_disabling_of_mu_toggle_when_restriction_applied"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto
new file mode 100644
index 0000000..8998f5b
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_get_user_property_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_get_user_property_cache"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
new file mode 100644
index 0000000..7b76334
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/fix_large_display_private_space_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "fix_large_display_private_space_settings"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
new file mode 100644
index 0000000..4d64722
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/modify_private_space_secondary_unlock_setup_flow_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "modify_private_space_secondary_unlock_setup_flow"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto
new file mode 100644
index 0000000..6f04770
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/private_space_search_illustration_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "private_space_search_illustration_config"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto
new file mode 100644
index 0000000..7a0475f
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/show_different_creation_error_for_unsupported_devices_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "show_different_creation_error_for_unsupported_devices"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto
new file mode 100644
index 0000000..2263e9d
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/stop_previous_user_apps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "stop_previous_user_apps"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto b/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
new file mode 100644
index 0000000..8918f62
--- /dev/null
+++ b/aconfig/trunk_staging/android.multiuser/unicorn_mode_refactoring_for_hsum_read_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.multiuser"
+  name: "unicorn_mode_refactoring_for_hsum_read_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto b/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto
new file mode 100644
index 0000000..9cfca52
--- /dev/null
+++ b/aconfig/trunk_staging/android.net.platform.flags/deprecate_network_policy_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.net.platform.flags"
+  name: "deprecate_network_policy_callback"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto b/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto
deleted file mode 100644
index 51d69e4..0000000
--- a/aconfig/trunk_staging/android.net.vcn/allow_disable_ipsec_loss_detector_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.net.vcn"
-  name: "allow_disable_ipsec_loss_detector"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto
new file mode 100644
index 0000000..936588d
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/enable_card_emulation_euicc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "enable_card_emulation_euicc"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/enable_tag_detection_broadcasts_flag_values.textproto b/aconfig/trunk_staging/android.nfc/enable_tag_detection_broadcasts_flag_values.textproto
deleted file mode 100644
index 830ae6a..0000000
--- a/aconfig/trunk_staging/android.nfc/enable_tag_detection_broadcasts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.nfc"
-  name: "enable_tag_detection_broadcasts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto
new file mode 100644
index 0000000..5906e7c
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_action_manage_services_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_action_manage_services_settings"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto
new file mode 100644
index 0000000..df0fa16
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_override_recover_routing_table_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_override_recover_routing_table"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto
new file mode 100644
index 0000000..2240740
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_persist_log_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_persist_log"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto
new file mode 100644
index 0000000..4680385
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_set_default_disc_tech_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_set_default_disc_tech"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto
new file mode 100644
index 0000000..6bd053a
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_state_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_state_change"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto b/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto
new file mode 100644
index 0000000..f67036f
--- /dev/null
+++ b/aconfig/trunk_staging/android.nfc/nfc_watchdog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.nfc"
+  name: "nfc_watchdog"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto
new file mode 100644
index 0000000..f168ce3
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/cancel_by_appops_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "cancel_by_appops"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto
new file mode 100644
index 0000000..d863e43
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/fix_audio_coupled_haptics_scaling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "fix_audio_coupled_haptics_scaling"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto
deleted file mode 100644
index 29b12be..0000000
--- a/aconfig/trunk_staging/android.os.vibrator/keyboard_category_enabled_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "keyboard_category_enabled"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto
new file mode 100644
index 0000000..bc7f1e5
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/load_haptic_feedback_vibration_customization_from_resources_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "load_haptic_feedback_vibration_customization_from_resources"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto
new file mode 100644
index 0000000..0b74bec
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/normalized_pwle_effects_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "normalized_pwle_effects"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
new file mode 100644
index 0000000..ec47997
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/throttle_vibration_params_requests_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "throttle_vibration_params_requests"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto
deleted file mode 100644
index ed2358e..0000000
--- a/aconfig/trunk_staging/android.os.vibrator/use_vibrator_haptic_feedback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os.vibrator"
-  name: "use_vibrator_haptic_feedback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto
new file mode 100644
index 0000000..e3f9751
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/vendor_vibration_effects_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "vendor_vibration_effects"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto b/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto
new file mode 100644
index 0000000..5ece451
--- /dev/null
+++ b/aconfig/trunk_staging/android.os.vibrator/vibration_xml_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os.vibrator"
+  name: "vibration_xml_apis"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto
deleted file mode 100644
index cf1804d..0000000
--- a/aconfig/trunk_staging/android.os/adpf_fmq_eager_send_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_fmq_eager_send"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto b/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto
deleted file mode 100644
index 2775bbf..0000000
--- a/aconfig/trunk_staging/android.os/adpf_use_fmq_channel_fixed_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "adpf_use_fmq_channel_fixed"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto b/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto
deleted file mode 100644
index 094b7f9..0000000
--- a/aconfig/trunk_staging/android.os/bugreport_mode_max_value_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.os"
-  name: "bugreport_mode_max_value"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto b/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto
new file mode 100644
index 0000000..eab7d52
--- /dev/null
+++ b/aconfig/trunk_staging/android.os/get_private_space_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "get_private_space_settings"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto b/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto
new file mode 100644
index 0000000..7abdb9f
--- /dev/null
+++ b/aconfig/trunk_staging/android.os/mainline_vcn_platform_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "mainline_vcn_platform_api"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto b/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto
new file mode 100644
index 0000000..097892d
--- /dev/null
+++ b/aconfig/trunk_staging/android.os/ordered_broadcast_multiple_permissions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "ordered_broadcast_multiple_permissions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto b/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto
new file mode 100644
index 0000000..70119d8
--- /dev/null
+++ b/aconfig/trunk_staging/android.os/perfetto_sdk_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.os"
+  name: "perfetto_sdk_tracing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto
new file mode 100644
index 0000000..05ca886
--- /dev/null
+++ b/aconfig/trunk_staging/android.permission.flags/appop_access_tracking_logging_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "appop_access_tracking_logging_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto
new file mode 100644
index 0000000..3a2b3a9
--- /dev/null
+++ b/aconfig/trunk_staging/android.permission.flags/check_op_validate_package_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "check_op_validate_package"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
new file mode 100644
index 0000000..2a72f61
--- /dev/null
+++ b/aconfig/trunk_staging/android.permission.flags/dont_remove_existing_uid_states_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "dont_remove_existing_uid_states"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto b/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
new file mode 100644
index 0000000..171f918
--- /dev/null
+++ b/aconfig/trunk_staging/android.permission.flags/location_bypass_privacy_dashboard_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.permission.flags"
+  name: "location_bypass_privacy_dashboard_enabled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.provider.flags/Android.bp b/aconfig/trunk_staging/android.provider.flags/Android.bp
new file mode 100644
index 0000000..cdf90a1
--- /dev/null
+++ b/aconfig/trunk_staging/android.provider.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-platform_build_release-trunk_staging-android.provider.flags-all",
+  package: "android.provider.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto b/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto
new file mode 100644
index 0000000..df9d768
--- /dev/null
+++ b/aconfig/trunk_staging/android.provider.flags/stage_flags_for_build_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider.flags"
+  name: "stage_flags_for_build"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto b/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto
new file mode 100644
index 0000000..b17559b
--- /dev/null
+++ b/aconfig/trunk_staging/android.provider/allow_config_maximum_call_log_entries_per_sim_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider"
+  name: "allow_config_maximum_call_log_entries_per_sim"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto b/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
new file mode 100644
index 0000000..01b27db
--- /dev/null
+++ b/aconfig/trunk_staging/android.provider/reduce_binder_transaction_size_for_get_all_properties_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.provider"
+  name: "reduce_binder_transaction_size_for_get_all_properties"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.sdk/Android.bp b/aconfig/trunk_staging/android.sdk/Android.bp
new file mode 100644
index 0000000..958299f
--- /dev/null
+++ b/aconfig/trunk_staging/android.sdk/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-platform_build_release-trunk_staging-android.sdk-all",
+  package: "android.sdk",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto b/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto
new file mode 100644
index 0000000..5892489
--- /dev/null
+++ b/aconfig/trunk_staging/android.sdk/major_minor_versioning_scheme_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.sdk"
+  name: "major_minor_versioning_scheme"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.security.keystore2/database_loop_timeout_flag_values.textproto b/aconfig/trunk_staging/android.security.keystore2/database_loop_timeout_flag_values.textproto
deleted file mode 100644
index e64e24f..0000000
--- a/aconfig/trunk_staging/android.security.keystore2/database_loop_timeout_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security.keystore2"
-  name: "database_loop_timeout"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto b/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto
new file mode 100644
index 0000000..4ace1bf
--- /dev/null
+++ b/aconfig/trunk_staging/android.security.keystore2/enable_dump_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.security.keystore2"
+  name: "enable_dump"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto b/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto
deleted file mode 100644
index 24c6f6d..0000000
--- a/aconfig/trunk_staging/android.security/fix_unlocked_device_required_keys_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.security"
-  name: "fix_unlocked_device_required_keys_v2"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto b/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto
new file mode 100644
index 0000000..0a82ff6
--- /dev/null
+++ b/aconfig/trunk_staging/android.server/allow_removing_vpn_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "allow_removing_vpn_service"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto b/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
new file mode 100644
index 0000000..fa1e781
--- /dev/null
+++ b/aconfig/trunk_staging/android.server/remove_wearable_sensing_service_from_wear_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.server"
+  name: "remove_wearable_sensing_service_from_wear"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto b/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
new file mode 100644
index 0000000..e611e38
--- /dev/null
+++ b/aconfig/trunk_staging/android.service.chooser/fix_resolver_memory_leak_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.chooser"
+  name: "fix_resolver_memory_leak"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto b/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
new file mode 100644
index 0000000..a96d767
--- /dev/null
+++ b/aconfig/trunk_staging/android.service.dreams/start_and_stop_dozing_in_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.service.dreams"
+  name: "start_and_stop_dozing_in_background"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto
new file mode 100644
index 0000000..315ea3c
--- /dev/null
+++ b/aconfig/trunk_staging/android.tracing/perfetto_view_capture_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.tracing"
+  name: "perfetto_view_capture_tracing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto
new file mode 100644
index 0000000..029736e
--- /dev/null
+++ b/aconfig/trunk_staging/android.tracing/perfetto_wm_dump_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.tracing"
+  name: "perfetto_wm_dump"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto b/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto
new file mode 100644
index 0000000..07b186d
--- /dev/null
+++ b/aconfig/trunk_staging/android.tracing/perfetto_wm_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.tracing"
+  name: "perfetto_wm_tracing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.uprobestats.flags/Android.bp b/aconfig/trunk_staging/android.uprobestats.flags/Android.bp
new file mode 100644
index 0000000..f0ef378
--- /dev/null
+++ b/aconfig/trunk_staging/android.uprobestats.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-platform_build_release-trunk_staging-android.uprobestats.flags-all",
+  package: "android.uprobestats.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/android.uprobestats.flags/enable_uprobestats_flag_values.textproto b/aconfig/trunk_staging/android.uprobestats.flags/enable_uprobestats_flag_values.textproto
new file mode 100644
index 0000000..dfba4d6
--- /dev/null
+++ b/aconfig/trunk_staging/android.uprobestats.flags/enable_uprobestats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.uprobestats.flags"
+  name: "enable_uprobestats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto
new file mode 100644
index 0000000..fba6fa1
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.accessibility/enable_type_window_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "enable_type_window_control"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto
new file mode 100644
index 0000000..a54f882
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.accessibility/global_action_media_play_pause_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "global_action_media_play_pause"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto
new file mode 100644
index 0000000..68d99a0
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.accessibility/global_action_menu_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "global_action_menu"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto b/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto
new file mode 100644
index 0000000..ef11b83
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.accessibility/remove_child_hover_check_for_touch_exploration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.accessibility"
+  name: "remove_child_hover_check_for_touch_exploration"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto
new file mode 100644
index 0000000..a27444d
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.flags/disable_draw_wake_lock_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "disable_draw_wake_lock"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
new file mode 100644
index 0000000..6d5efde
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.flags/enable_vector_cursor_a11y_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.flags"
+  name: "enable_vector_cursor_a11y_settings"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_by_size_read_only_flag_values.textproto b/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_by_size_read_only_flag_values.textproto
deleted file mode 100644
index 411b25b..0000000
--- a/aconfig/trunk_staging/android.view.flags/toolkit_frame_rate_by_size_read_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "android.view.flags"
-  name: "toolkit_frame_rate_by_size_read_only"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto
new file mode 100644
index 0000000..e68f165
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.inputmethod/compatchange_for_zerojankproxy_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "compatchange_for_zerojankproxy"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto b/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto
new file mode 100644
index 0000000..71efeff
--- /dev/null
+++ b/aconfig/trunk_staging/android.view.inputmethod/ime_switcher_revamp_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.view.inputmethod"
+  name: "ime_switcher_revamp_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto b/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
new file mode 100644
index 0000000..111da1c
--- /dev/null
+++ b/aconfig/trunk_staging/android.widget.flags/conversation_layout_use_maximum_child_height_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "android.widget.flags"
+  name: "conversation_layout_use_maximum_child_height"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto b/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto
new file mode 100644
index 0000000..6b5910c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.adservices.flags/sdksandbox_invalidate_effective_target_sdk_version_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.adservices.flags"
+  name: "sdksandbox_invalidate_effective_target_sdk_version_cache"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto
new file mode 100644
index 0000000..8bb5abe
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/apps_indexer_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "apps_indexer_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto
new file mode 100644
index 0000000..1876317
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_contacts_index_first_middle_and_last_names_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_contacts_index_first_middle_and_last_names"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto
new file mode 100644
index 0000000..a87bf81
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_enterprise_empty_batch_result_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_enterprise_empty_batch_result_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto
new file mode 100644
index 0000000..c76f797
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_generic_document_over_ipc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_generic_document_over_ipc"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
new file mode 100644
index 0000000..2c321a1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_informational_ranking_expressions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_informational_ranking_expressions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto
new file mode 100644
index 0000000..4619c1e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_result_denied_and_result_rate_limited_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_result_denied_and_result_rate_limited"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
new file mode 100644
index 0000000..aaec476
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_schema_embedding_property_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_schema_embedding_property_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto
new file mode 100644
index 0000000..bbf5745
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/enable_search_spec_search_string_parameters_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.appsearch.flags"
+  name: "enable_search_spec_search_string_parameters"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.art.flags/OWNERS b/aconfig/trunk_staging/com.android.art.flags/OWNERS
deleted file mode 100644
index 3414a74..0000000
--- a/aconfig/trunk_staging/com.android.art.flags/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-include platform/art:/OWNERS
diff --git a/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto
deleted file mode 100644
index 3e5fb0c..0000000
--- a/aconfig/trunk_staging/com.android.art.flags/m2024_09_ramp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "m2024_09_ramp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto b/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto
deleted file mode 100644
index 741cb58..0000000
--- a/aconfig/trunk_staging/com.android.art.flags/m2024_10_ramp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.art.flags"
-  name: "m2024_10_ramp"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
new file mode 100644
index 0000000..c05aabe
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_aidl_encoding_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_aidl_encoding_interval"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto
new file mode 100644
index 0000000..ecf675c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_broadcast_connection_state_when_turned_off_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_broadcast_connection_state_when_turned_off"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
new file mode 100644
index 0000000..16563b8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_check_lea_iso_channel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_check_lea_iso_channel"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto
deleted file mode 100644
index cb22de4..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_concurrent_source_sink_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_concurrent_source_sink"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
new file mode 100644
index 0000000..24bb057
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_fix_codec_type_in_java_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_fix_codec_type_in_java"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto
new file mode 100644
index 0000000..dac53a2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_ignore_started_when_responder_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "a2dp_ignore_started_when_responder"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto
deleted file mode 100644
index 127c266..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/a2dp_offload_codec_extensibility_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "a2dp_offload_codec_extensibility"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
new file mode 100644
index 0000000..9be2422
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_always_fallback_to_available_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "adm_always_fallback_to_available_device"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
new file mode 100644
index 0000000..eaee2f7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/adm_fallback_when_wired_audio_disconnected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "adm_fallback_when_wired_audio_disconnected"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto
deleted file mode 100644
index cd6a377..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/airplane_mode_x_ble_on_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "airplane_mode_x_ble_on"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
new file mode 100644
index 0000000..2d86ee4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/android_os_identifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "android_os_identifier"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto
deleted file mode 100644
index 756bd4a..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_asrc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "asha_asrc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
new file mode 100644
index 0000000..8eec620
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/asha_encrypted_l2c_coc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "asha_encrypted_l2c_coc"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto
deleted file mode 100644
index 22cc03c..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_connect_on_hfp_when_no_a2dp_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_connect_on_hfp_when_no_a2dp_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto
deleted file mode 100644
index 91fa763..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/auto_on_feature_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "auto_on_feature"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
new file mode 100644
index 0000000..c4518f6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/avdt_discover_seps_as_acceptor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avdt_discover_seps_as_acceptor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
new file mode 100644
index 0000000..a67acf8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/avdtp_error_codes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avdtp_error_codes"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
new file mode 100644
index 0000000..128c4e6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_connect_a2dp_with_delay_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avrcp_connect_a2dp_with_delay"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
new file mode 100644
index 0000000..4713937
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/avrcp_sdp_records_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "avrcp_sdp_records"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
new file mode 100644
index 0000000..d031122
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/ble_scan_adv_metrics_redesign_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ble_scan_adv_metrics_redesign"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto
deleted file mode 100644
index 3aaff76..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bluffs_mitigation_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bluffs_mitigation"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/browsing_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/browsing_refactor_flag_values.textproto
new file mode 100644
index 0000000..da5d1e4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/browsing_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "browsing_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto
new file mode 100644
index 0000000..15953bb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_setconfig_rej_type_confusion_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "bta_av_setconfig_rej_type_confusion"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto
new file mode 100644
index 0000000..d55ad38
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_av_use_peer_codec_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "bta_av_use_peer_codec"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto
deleted file mode 100644
index b092632..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/bta_dm_disc_stuck_in_cancelling_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "bta_dm_disc_stuck_in_cancelling_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
new file mode 100644
index 0000000..424d37c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/cancel_open_discovery_client_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "cancel_open_discovery_client"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto
new file mode 100644
index 0000000..049adb1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/channel_sounding_in_stack_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "channel_sounding_in_stack"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
new file mode 100644
index 0000000..a21f12a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/choose_wrong_hfp_codec_in_specific_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "choose_wrong_hfp_codec_in_specific_config"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto
new file mode 100644
index 0000000..9bb2a2d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/clear_auth_collision_state_on_pairing_complete_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "clear_auth_collision_state_on_pairing_complete"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/clear_pairing_state_when_no_devrec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/clear_pairing_state_when_no_devrec_flag_values.textproto
new file mode 100644
index 0000000..7fe6279
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/clear_pairing_state_when_no_devrec_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "clear_pairing_state_when_no_devrec"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
new file mode 100644
index 0000000..de4f74f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/close_hid_only_if_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "close_hid_only_if_connected"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto
deleted file mode 100644
index b6c9d91..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/close_rfcomm_instead_of_reset_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "close_rfcomm_instead_of_reset"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto
deleted file mode 100644
index 77a677f..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/connect_hid_after_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "connect_hid_after_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto
deleted file mode 100644
index 7f88b89..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/continue_service_discovery_when_cancel_device_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "continue_service_discovery_when_cancel_device_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto
deleted file mode 100644
index 35dd6f6..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/correct_bond_type_of_loaded_devices_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "correct_bond_type_of_loaded_devices"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto
deleted file mode 100644
index 6144727..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/divide_long_single_gap_data_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "divide_long_single_gap_data"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto
deleted file mode 100644
index e73a0a0..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/do_not_replace_existing_cod_with_uncategorized_cod_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "do_not_replace_existing_cod_with_uncategorized_cod"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto
new file mode 100644
index 0000000..53a67ae
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/donot_push_error_code_to_app_when_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "donot_push_error_code_to_app_when_connected"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto
deleted file mode 100644
index d80d7d2..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/dumpsys_acquire_stack_when_executing_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "dumpsys_acquire_stack_when_executing"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto
new file mode 100644
index 0000000..9adca0c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/encryption_change_v2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "encryption_change_v2"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto
new file mode 100644
index 0000000..30e7bba
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/enforce_resolve_system_service_behavior_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "enforce_resolve_system_service_behavior"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto
deleted file mode 100644
index 2242337..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ensure_valid_adv_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ensure_valid_adv_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto
deleted file mode 100644
index 5a06d64..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/explicit_kill_from_system_server_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "explicit_kill_from_system_server"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
new file mode 100644
index 0000000..c195987
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_evt_cancelling_sdp_discovery_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "fix_le_evt_cancelling_sdp_discovery"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto
deleted file mode 100644
index ea261e6..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_oob_pairing_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_le_oob_pairing_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto
deleted file mode 100644
index 8684b95..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_le_pairing_passkey_entry_bypass_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_le_pairing_passkey_entry_bypass"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto
deleted file mode 100644
index df78570..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_pairing_failure_reason_from_remote_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "fix_pairing_failure_reason_from_remote"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto
new file mode 100644
index 0000000..a0dc4b3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/fix_sco_command_status_handling_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "fix_sco_command_status_handling"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto
deleted file mode 100644
index a4206a6..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/force_bredr_for_sdp_retry_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "force_bredr_for_sdp_retry"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto
new file mode 100644
index 0000000..d17fd60
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_callback_on_failure_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_callback_on_failure"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto
new file mode 100644
index 0000000..1ba36d6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_disconnect_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_disconnect_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto
deleted file mode 100644
index 6cd4fdb..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_drop_acl_on_out_of_resources_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_drop_acl_on_out_of_resources_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
new file mode 100644
index 0000000..1f06f1d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_fix_multiple_direct_connect_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_fix_multiple_direct_connect"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto
deleted file mode 100644
index 80ccb8d..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_reconnect_on_bt_on_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "gatt_reconnect_on_bt_on_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto
new file mode 100644
index 0000000..a85a883
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/gatt_server_requests_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "gatt_server_requests_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto
deleted file mode 100644
index 02eba00..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/get_address_type_api_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "get_address_type_api"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto
new file mode 100644
index 0000000..0201ac3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/get_state_from_system_server_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "get_state_from_system_server"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
new file mode 100644
index 0000000..d3f7738
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/headtracker_sdu_size_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "headtracker_sdu_size"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_allow_volume_change_without_sco_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_allow_volume_change_without_sco_flag_values.textproto
new file mode 100644
index 0000000..1daf318
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_allow_volume_change_without_sco_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "hfp_allow_volume_change_without_sco"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto
deleted file mode 100644
index 62d99bc..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/hfp_codec_aptx_voice_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "hfp_codec_aptx_voice"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
new file mode 100644
index 0000000..161e0f6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/hid_report_queuing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "hid_report_queuing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
new file mode 100644
index 0000000..a671456
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_not_known_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "identity_address_null_if_not_known"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_unknown_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_unknown_flag_values.textproto
deleted file mode 100644
index 7512a71..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/identity_address_null_if_unknown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "identity_address_null_if_unknown"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto
deleted file mode 100644
index 8b1fa06..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_bond_type_for_le_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "ignore_bond_type_for_le"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto
new file mode 100644
index 0000000..f1843d0
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/ignore_notify_when_already_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "ignore_notify_when_already_connected"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto
new file mode 100644
index 0000000..18675cc
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/improve_create_connection_for_already_connecting_device_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "improve_create_connection_for_already_connecting_device"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
new file mode 100644
index 0000000..7709c74
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/initiate_multiple_hid_connections_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "initiate_multiple_hid_connections"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto
deleted file mode 100644
index 86a4fb6..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_hfp_active_during_leaudio_handover_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "keep_hfp_active_during_leaudio_handover"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto
deleted file mode 100644
index 7214436..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/keep_stopped_media_browser_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "keep_stopped_media_browser_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto
new file mode 100644
index 0000000..223fd26
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/key_missing_as_ordered_broadcast_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "key_missing_as_ordered_broadcast"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto
new file mode 100644
index 0000000..2d8d2ec
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/kill_instead_of_exit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "kill_instead_of_exit"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto
new file mode 100644
index 0000000..1534c38
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_le_do_not_adjust_min_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "l2cap_le_do_not_adjust_min_interval"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
new file mode 100644
index 0000000..9aba72b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/l2cap_update_existing_conn_interval_with_base_interval_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "l2cap_update_existing_conn_interval_with_base_interval"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
new file mode 100644
index 0000000..e47f79a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/le_ase_read_multiple_variable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_ase_read_multiple_variable"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto
deleted file mode 100644
index 6717d40..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_audio_dev_type_detection_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_audio_dev_type_detection_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnection_flag_values.textproto
new file mode 100644
index 0000000..c9dfd7e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/le_enc_on_reconnection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_enc_on_reconnection"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
new file mode 100644
index 0000000..3d8d357
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/le_inquiry_duration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_inquiry_duration"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto
deleted file mode 100644
index 31edf4b..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/le_periodic_scanning_reassembler_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "le_periodic_scanning_reassembler"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
new file mode 100644
index 0000000..34bbb60
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/le_scan_use_address_type_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "le_scan_use_address_type"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto
deleted file mode 100644
index 2b6c1a2..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_active_device_manager_group_handling_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_active_device_manager_group_handling_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto
deleted file mode 100644
index 475c701..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_add_sampling_frequencies_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_add_sampling_frequencies"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto
deleted file mode 100644
index e65d26d..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_api_synchronized_block_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_api_synchronized_block_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto
deleted file mode 100644
index f9c383e..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_assistant_handle_command_statuses_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_broadcast_assistant_handle_command_statuses"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
new file mode 100644
index 0000000..d3d232e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_update_metadata_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_update_metadata_callback"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
new file mode 100644
index 0000000..7f93a15
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_broadcast_volume_control_primary_group_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_broadcast_volume_control_primary_group_only"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
new file mode 100644
index 0000000..48bf4e5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_call_start_scan_directly_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_call_start_scan_directly"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto
deleted file mode 100644
index f69b432..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_callback_on_group_stream_status_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_callback_on_group_stream_status"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
new file mode 100644
index 0000000..f0929a4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_codec_config_callback_order_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_codec_config_callback_order_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto
deleted file mode 100644
index 613a8eb..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_enable_health_based_actions_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_enable_health_based_actions"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto
deleted file mode 100644
index f798122..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_mcs_tbs_authorization_rebond_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_mcs_tbs_authorization_rebond_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto
deleted file mode 100644
index 958cb17..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_quick_leaudio_toggle_switch_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_quick_leaudio_toggle_switch_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto
deleted file mode 100644
index da8655e..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_resume_active_after_hfp_handover_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_resume_active_after_hfp_handover"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto
new file mode 100644
index 0000000..0d73296
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_set_codec_config_preference_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_set_codec_config_preference"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
new file mode 100644
index 0000000..f4080ef
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_speed_up_reconfiguration_between_call_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_speed_up_reconfiguration_between_call"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto
deleted file mode 100644
index 0714291..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_start_stream_race_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_start_stream_race_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto
deleted file mode 100644
index dc2ba8f..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_inactivate_device_based_on_context_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_unicast_inactivate_device_based_on_context"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto
new file mode 100644
index 0000000..d7dcff8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_unicast_no_available_contexts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_unicast_no_available_contexts"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
new file mode 100644
index 0000000..0b98bec
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_use_audio_mode_listener_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "leaudio_use_audio_mode_listener"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto
deleted file mode 100644
index 3eac0c5..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/leaudio_volume_change_on_ringtone_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "leaudio_volume_change_on_ringtone_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto
deleted file mode 100644
index 6be64b1..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/load_did_config_from_sysprops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "load_did_config_from_sysprops"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto
deleted file mode 100644
index 3d0add3..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/mfi_has_uuid_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "mfi_has_uuid"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
new file mode 100644
index 0000000..ddeb7e5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/name_discovery_for_le_pairing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "name_discovery_for_le_pairing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto
new file mode 100644
index 0000000..6981d3f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/non_wake_alarm_for_rpa_rotation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "non_wake_alarm_for_rpa_rotation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
new file mode 100644
index 0000000..dc57980
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/opp_ignore_content_observer_after_service_stop_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "opp_ignore_content_observer_after_service_stop"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
new file mode 100644
index 0000000..b66b004
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/override_context_to_specify_device_id_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "override_context_to_specify_device_id"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
new file mode 100644
index 0000000..95a039b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/pairing_name_discovery_addresss_mismatch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "pairing_name_discovery_addresss_mismatch"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
new file mode 100644
index 0000000..cdc16bb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/pan_use_identity_address_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "pan_use_identity_address"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto
deleted file mode 100644
index 39be581..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/pretend_network_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "pretend_network_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto
new file mode 100644
index 0000000..6034340
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/prevent_duplicate_uuid_intent_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "prevent_duplicate_uuid_intent"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
new file mode 100644
index 0000000..a4a0629
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/progress_acl_scheduler_upon_incoming_connection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "progress_acl_scheduler_upon_incoming_connection"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto
deleted file mode 100644
index b2fd19f..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/read_model_num_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "read_model_num_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto
new file mode 100644
index 0000000..e9fa2b2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_dup_pairing_response_in_oob_pairing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "remove_dup_pairing_response_in_oob_pairing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
new file mode 100644
index 0000000..98d9f97
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_input_device_on_vup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "remove_input_device_on_vup"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto
new file mode 100644
index 0000000..b3011a1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/remove_one_time_get_name_and_address_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "remove_one_time_get_name_and_address"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto
deleted file mode 100644
index 3b15ac1..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/reset_pairing_only_for_related_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "reset_pairing_only_for_related_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
new file mode 100644
index 0000000..3ed2e9b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/rfcomm_prevent_unnecessary_collisions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "rfcomm_prevent_unnecessary_collisions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto
deleted file mode 100644
index dba4766..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_present_during_service_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_present_during_service_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto
deleted file mode 100644
index fa8d15b..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/rnr_reset_state_at_cancel_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "rnr_reset_state_at_cancel"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto
new file mode 100644
index 0000000..7e02f74
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/run_ble_audio_ticks_in_worker_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "run_ble_audio_ticks_in_worker_thread"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto
new file mode 100644
index 0000000..2ead8b4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/run_clock_recovery_in_worker_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "run_clock_recovery_in_worker_thread"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto
new file mode 100644
index 0000000..54a67c9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/save_peer_csrk_after_ltk_gen_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "save_peer_csrk_after_ltk_gen"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto
deleted file mode 100644
index 2c88f1e..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/separate_service_and_device_discovery_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "separate_service_and_device_discovery"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto
new file mode 100644
index 0000000..92eae88
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/serialize_hogp_and_dis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "serialize_hogp_and_dis"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto
new file mode 100644
index 0000000..94c7084
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/set_addressed_player_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "set_addressed_player"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
new file mode 100644
index 0000000..fd890b6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/stop_on_offload_fail_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "stop_on_offload_fail"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto
deleted file mode 100644
index 8b49bfd..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/synchronous_bta_sec_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "synchronous_bta_sec"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
new file mode 100644
index 0000000..ca575ff
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/transmit_smp_packets_before_release_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "transmit_smp_packets_before_release"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
new file mode 100644
index 0000000..14f1792
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/unbonded_profile_forbid_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "unbonded_profile_forbid_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto
new file mode 100644
index 0000000..73370f5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/update_active_device_in_band_ringtone_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "update_active_device_in_band_ringtone"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto
deleted file mode 100644
index 9c0deca..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/update_inquiry_result_on_flag_change_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "update_inquiry_result_on_flag_change"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
new file mode 100644
index 0000000..04c3c12
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "update_sco_state_correctly_on_rfcomm_disconnect_during_codec_nego"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto
deleted file mode 100644
index 01d801f..0000000
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/use_dsp_codec_when_controller_does_not_support_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.bluetooth.flags"
-  name: "use_dsp_codec_when_controller_does_not_support"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto
new file mode 100644
index 0000000..8318221
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/use_encrypt_req_for_av_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "use_encrypt_req_for_av"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto b/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
new file mode 100644
index 0000000..8d009b8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/wait_for_disconnect_before_unbond_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.bluetooth.flags"
+  name: "wait_for_disconnect_before_unbond"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto b/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
new file mode 100644
index 0000000..8cb114c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.btaudio.hal.flags/leaudio_report_broadcast_ac_to_hal_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.btaudio.hal.flags"
+  name: "leaudio_report_broadcast_ac_to_hal"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto
new file mode 100644
index 0000000..6e23abd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.car.settings/hotspot_ui_speed_update_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "hotspot_ui_speed_update"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
new file mode 100644
index 0000000..81c0662
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.car.settings/microphone_privacy_updates_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "microphone_privacy_updates"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
new file mode 100644
index 0000000..71ec1ee
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.car.settings/required_infotainment_apps_settings_page_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "required_infotainment_apps_settings_page"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto b/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto
new file mode 100644
index 0000000..a4c26ab
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.car.settings/update_date_and_time_page_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.car.settings"
+  name: "update_date_and_time_page"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto
new file mode 100644
index 0000000..991cc52
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.flags/ok_lab_colorspace_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.flags"
+  name: "ok_lab_colorspace"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto
new file mode 100644
index 0000000..6dce5b6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.hwui.flags/iso_gainmap_apis_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "iso_gainmap_apis"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
new file mode 100644
index 0000000..3924fa4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.hwui.flags/resample_gainmap_regions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "resample_gainmap_regions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto
new file mode 100644
index 0000000..9412eb9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.hwui.flags/skip_eglmanager_telemetry_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.hwui.flags"
+  name: "skip_eglmanager_telemetry"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
new file mode 100644
index 0000000..4b1eb46
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_consumer_attach_callback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "bq_consumer_attach_callback"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto
new file mode 100644
index 0000000..9b5427f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_extendedallocate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "bq_extendedallocate"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto
new file mode 100644
index 0000000..2906995
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/bq_producer_throttles_only_async_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "bq_producer_throttles_only_async_mode"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
new file mode 100644
index 0000000..0ab9221
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/trace_frame_rate_override_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "trace_frame_rate_override"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto
new file mode 100644
index 0000000..578d451
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/wb_platform_api_improvements_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libgui.flags"
+  name: "wb_platform_api_improvements"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/Android.bp
new file mode 100644
index 0000000..e9ac477
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libvulkan.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-platform_build_release-trunk_staging-com.android.graphics.libvulkan.flags-all",
+  package: "com.android.graphics.libvulkan.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto
new file mode 100644
index 0000000..d8323e6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.libvulkan.flags/swapchain_mutable_format_ext_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.libvulkan.flags"
+  name: "swapchain_mutable_format_ext"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
new file mode 100644
index 0000000..e53ed7e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/allow_n_vsyncs_in_targeter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "allow_n_vsyncs_in_targeter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto
new file mode 100644
index 0000000..411d22a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/correct_dpi_with_display_size_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "correct_dpi_with_display_size"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto
new file mode 100644
index 0000000..6f9b308
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/filter_frames_before_trace_starts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "filter_frames_before_trace_starts"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto
new file mode 100644
index 0000000..21c449a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/true_hdr_screenshots_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "true_hdr_screenshots"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto
new file mode 100644
index 0000000..86edec5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/view_set_requested_frame_rate_mrr_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "view_set_requested_frame_rate_mrr"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
new file mode 100644
index 0000000..268fe3f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/vrr_bugfix_dropped_frame_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.graphics.surfaceflinger.flags"
+  name: "vrr_bugfix_dropped_frame"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto
new file mode 100644
index 0000000..bb65144
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/keyboard_a11y_mouse_keys_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_a11y_mouse_keys"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto
new file mode 100644
index 0000000..6d621e6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/keyboard_glyph_map_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_glyph_map"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
new file mode 100644
index 0000000..8965e28
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/keyboard_layout_manager_multi_user_ime_setup_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "keyboard_layout_manager_multi_user_ime_setup"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
new file mode 100644
index 0000000..6e4dd5c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_dump_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "modifier_shortcut_dump"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto
new file mode 100644
index 0000000..02f983c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/modifier_shortcut_manager_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "modifier_shortcut_manager_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto
new file mode 100644
index 0000000..bc9f76e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.input/touchpad_visualizer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.input"
+  name: "touchpad_visualizer"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
new file mode 100644
index 0000000..9cdbca5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/sensor_event_queue_report_sensor_usage_in_tracing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.hardware.libsensor.flags"
+  name: "sensor_event_queue_report_sensor_usage_in_tracing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/Android.bp b/aconfig/trunk_staging/com.android.healthfitness.flags/Android.bp
new file mode 100644
index 0000000..9592fcb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.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-platform_build_release-trunk_staging-com.android.healthfitness.flags-all",
+  package: "com.android.healthfitness.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto
new file mode 100644
index 0000000..f62b651
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/clear_caches_after_switching_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "clear_caches_after_switching_user"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto
new file mode 100644
index 0000000..4531451
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/d2d_file_deletion_bug_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "d2d_file_deletion_bug_fix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto
new file mode 100644
index 0000000..4410ac6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/dependency_injection_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "dependency_injection"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto
new file mode 100644
index 0000000..7939dd9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/development_database_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "development_database"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto
new file mode 100644
index 0000000..1fd2a83
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_fast_follow_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "export_import_fast_follow"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto
new file mode 100644
index 0000000..b851fa5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/export_import_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "export_import"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto
new file mode 100644
index 0000000..3cd7efd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/infra_to_guard_db_changes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "infra_to_guard_db_changes"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto
new file mode 100644
index 0000000..76b9aee
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/mindfulness_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "mindfulness"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto
new file mode 100644
index 0000000..943650a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/new_information_architecture_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "new_information_architecture"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/onboarding_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/onboarding_flag_values.textproto
new file mode 100644
index 0000000..440b764
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/onboarding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "onboarding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto
new file mode 100644
index 0000000..7f0c997
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_database_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "personal_health_record_database"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto
new file mode 100644
index 0000000..605397b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/personal_health_record_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "personal_health_record"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto b/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto
new file mode 100644
index 0000000..fea7933
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.healthfitness.flags/read_assets_for_disabled_apps_from_package_manager_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.healthfitness.flags"
+  name: "read_assets_for_disabled_apps_from_package_manager"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto
new file mode 100644
index 0000000..8ab795b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/device_associations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "device_associations"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
deleted file mode 100644
index 091c8fa..0000000
--- a/aconfig/trunk_staging/com.android.input.flags/enable_gestures_library_timer_provider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "enable_gestures_library_timer_provider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto
new file mode 100644
index 0000000..eddf3a2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/enable_input_policy_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_input_policy_profile"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
new file mode 100644
index 0000000..bff3ac3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/enable_keyboard_classifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_keyboard_classifier"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto
new file mode 100644
index 0000000..4d9c0cf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/enable_touchpad_no_focus_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "enable_touchpad_no_focus_change"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto
new file mode 100644
index 0000000..f9cfaf8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/include_relative_axis_values_for_captured_touchpads_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "include_relative_axis_values_for_captured_touchpads"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto
new file mode 100644
index 0000000..216b6e3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/keyboard_repeat_keys_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "keyboard_repeat_keys"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
new file mode 100644
index 0000000..d6a0ab7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/remove_input_channel_from_windowstate_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "remove_input_channel_from_windowstate"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto
deleted file mode 100644
index f49f6c8..0000000
--- a/aconfig/trunk_staging/com.android.input.flags/remove_pointer_event_tracking_in_wm_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.input.flags"
-  name: "remove_pointer_event_tracking_in_wm"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto b/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto
new file mode 100644
index 0000000..b1a60fd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.input.flags/split_all_touches_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.input.flags"
+  name: "split_all_touches"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto
deleted file mode 100644
index 40dc3d9..0000000
--- a/aconfig/trunk_staging/com.android.intentresolver/bespoke_label_view_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "bespoke_label_view"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
new file mode 100644
index 0000000..bca2af8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/fix_drawer_offset_on_config_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_drawer_offset_on_config_change"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
new file mode 100644
index 0000000..a2a466b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/fix_missing_drawer_offset_calculation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_missing_drawer_offset_calculation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto
deleted file mode 100644
index 6edc1f4..0000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_partial_image_edit_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_partial_image_edit_transition"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
new file mode 100644
index 0000000..a1a7bf3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcut_loader_job_leak_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_shortcut_loader_job_leak"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto
new file mode 100644
index 0000000..0cc18cc
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/fix_shortcuts_flashing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "fix_shortcuts_flashing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto
deleted file mode 100644
index bb7cdf9..0000000
--- a/aconfig/trunk_staging/com.android.intentresolver/fix_target_list_footer_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.intentresolver"
-  name: "fix_target_list_footer"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto
new file mode 100644
index 0000000..124ac28
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/preview_image_loader_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "preview_image_loader"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto
new file mode 100644
index 0000000..111fbbf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/shareousel_scroll_offscreen_selections_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "shareousel_scroll_offscreen_selections"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto
new file mode 100644
index 0000000..9132a2e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/shareousel_update_exclude_components_extra_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "shareousel_update_exclude_components_extra"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto b/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto
new file mode 100644
index 0000000..6776e36
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.intentresolver/unselect_final_item_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.intentresolver"
+  name: "unselect_final_item"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto
new file mode 100644
index 0000000..fe48ec9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/api1_release_binderlock_before_cameraservice_disconnect_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "api1_release_binderlock_before_cameraservice_disconnect"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
new file mode 100644
index 0000000..f214b62
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/bump_preview_frame_space_priority_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "bump_preview_frame_space_priority"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto
new file mode 100644
index 0000000..c430063
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/dumpsys_request_stream_ids_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "dumpsys_request_stream_ids"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto
new file mode 100644
index 0000000..e4b513b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/enable_hal_abort_from_cameraservicewatchdog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "enable_hal_abort_from_cameraservicewatchdog"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto
deleted file mode 100644
index 97de240..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/lazy_aidl_wait_for_service_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "lazy_aidl_wait_for_service"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
deleted file mode 100644
index 3a1577a..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/log_ultrawide_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "log_ultrawide_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
deleted file mode 100644
index 9daa87d..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/log_zoom_override_usage_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "log_zoom_override_usage"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
new file mode 100644
index 0000000..56d24e1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/multi_res_raw_reprocessing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "multi_res_raw_reprocessing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto
deleted file mode 100644
index 4e51cad..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/realtime_priority_bump_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "realtime_priority_bump"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto
deleted file mode 100644
index caa225a..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "single_thread_executor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
new file mode 100644
index 0000000..532ec60
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/single_thread_executor_naming_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.camera.flags"
+  name: "single_thread_executor_naming"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto
deleted file mode 100644
index f95e3f7..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_ipc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "surface_ipc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto
deleted file mode 100644
index 9dcf979..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/surface_leak_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "surface_leak_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto
deleted file mode 100644
index 4a7bc86..0000000
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/watch_foreground_changes_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.camera.flags"
-  name: "watch_foreground_changes"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto
new file mode 100644
index 0000000..fbf3e96
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.os/debug_store_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.os"
+  name: "debug_store_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
new file mode 100644
index 0000000..ead161f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.os/use_transaction_codes_for_unknown_methods_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.os"
+  name: "use_transaction_codes_for_unknown_methods"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto
deleted file mode 100644
index 8ef81ba..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/add_anomaly_when_notify_config_changed_with_invalid_phone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "add_anomaly_when_notify_config_changed_with_invalid_phone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto
deleted file mode 100644
index 9414e4a..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/allow_mmtel_in_non_vops_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "allow_mmtel_in_non_vops"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
new file mode 100644
index 0000000..c6bf50a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/avoid_deleting_ims_object_from_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "avoid_deleting_ims_object_from_cache"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto
deleted file mode 100644
index 3f984fd..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/cleanup_open_logical_channel_record_on_dispose_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "cleanup_open_logical_channel_record_on_dispose"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto
deleted file mode 100644
index ec13d53..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/data_only_service_allow_emergency_call_only_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "data_only_service_allow_emergency_call_only"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
new file mode 100644
index 0000000..718bdb3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/delay_phone_account_registration_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "delay_phone_account_registration"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
new file mode 100644
index 0000000..0815f67
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/enable_carrier_config_n1_control_attempt2_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "enable_carrier_config_n1_control_attempt2"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto
deleted file mode 100644
index 9e004db..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/fix_crash_on_getting_config_when_phone_is_gone_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "fix_crash_on_getting_config_when_phone_is_gone"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto
deleted file mode 100644
index 1052d0a..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/force_iwlan_mms_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "force_iwlan_mms"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
new file mode 100644
index 0000000..b864789
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/hangup_emergency_call_for_cross_sim_redialing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "hangup_emergency_call_for_cross_sim_redialing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto
deleted file mode 100644
index a98707a..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/hide_preinstalled_carrier_app_at_most_once_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "hide_preinstalled_carrier_app_at_most_once"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto
new file mode 100644
index 0000000..f29ad40
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/hsum_broadcast_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "hsum_broadcast"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto
deleted file mode 100644
index 83e71ae..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/ignore_existing_networks_for_internet_allowed_checking_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "ignore_existing_networks_for_internet_allowed_checking"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto
deleted file mode 100644
index 4e72ad6..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/metered_embb_urlcc_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "metered_embb_urlcc"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
new file mode 100644
index 0000000..dae660c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/mms_get_apn_from_pdsc_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "mms_get_apn_from_pdsc"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto
new file mode 100644
index 0000000..c6daf8c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/national_country_code_formatting_for_local_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "national_country_code_formatting_for_local_calls"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto
deleted file mode 100644
index 519f8f7..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/notify_data_activity_changed_with_slot_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "notify_data_activity_changed_with_slot"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto
new file mode 100644
index 0000000..1126a10
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/optimization_apdu_sender_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "optimization_apdu_sender"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
new file mode 100644
index 0000000..c7a0cc4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/prevent_hangup_during_call_merge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "prevent_hangup_during_call_merge"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto
deleted file mode 100644
index d028cb6..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/refine_preferred_data_profile_selection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "refine_preferred_data_profile_selection"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
deleted file mode 100644
index 5405abe..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/relax_ho_teardown_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "relax_ho_teardown"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
new file mode 100644
index 0000000..8bde7c7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/remap_disconnect_cause_sip_request_cancelled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "remap_disconnect_cause_sip_request_cancelled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
new file mode 100644
index 0000000..3306d81
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/sim_disabled_graceful_tear_down_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "sim_disabled_graceful_tear_down"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto
new file mode 100644
index 0000000..8db79fb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/sms_mms_deliver_broadcasts_redirect_to_main_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "sms_mms_deliver_broadcasts_redirect_to_main_user"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto
new file mode 100644
index 0000000..3074ba9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/support_network_provider_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "support_network_provider"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
new file mode 100644
index 0000000..b9d2798
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_app_count_check_to_create_channel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "uicc_app_count_check_to_create_channel"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
new file mode 100644
index 0000000..63c227f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/uicc_phone_number_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "uicc_phone_number_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
deleted file mode 100644
index 89b5b67..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/unthrottle_check_transport_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "unthrottle_check_transport"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto
deleted file mode 100644
index a8c51ce..0000000
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_alarm_callback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.internal.telephony.flags"
-  name: "use_alarm_callback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
new file mode 100644
index 0000000..e720c8e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/use_carrier_config_for_cfnry_time_via_mmi_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.internal.telephony.flags"
+  name: "use_carrier_config_for_cfnry_time_via_mmi"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto
new file mode 100644
index 0000000..a843cd2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/accessibility_scroll_on_allapps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "accessibility_scroll_on_allapps"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
new file mode 100644
index 0000000..b24414f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/enable_desktop_task_alpha_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_desktop_task_alpha_animation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
new file mode 100644
index 0000000..89e4328
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/enable_hover_of_child_elements_in_taskview_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_hover_of_child_elements_in_taskview"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
new file mode 100644
index 0000000..897cca2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/enable_overview_command_helper_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "enable_overview_command_helper_timeout"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto
new file mode 100644
index 0000000..0cc9c1f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/ignore_three_finger_trackpad_for_nav_handle_long_press_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "ignore_three_finger_trackpad_for_nav_handle_long_press"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto
new file mode 100644
index 0000000..ae9566e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/multiline_search_bar_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "multiline_search_bar"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto
new file mode 100644
index 0000000..bc1f030
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/navigate_to_child_preference_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "navigate_to_child_preference"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
new file mode 100644
index 0000000..e995c99
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/private_space_add_floating_mask_view_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "private_space_add_floating_mask_view"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto
new file mode 100644
index 0000000..a78ecd6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/taskbar_overflow_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "taskbar_overflow"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto b/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
new file mode 100644
index 0000000..6ddc5ad
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.launcher3/use_new_icon_for_archived_apps_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.launcher3"
+  name: "use_new_icon_for_archived_apps"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/Android.bp b/aconfig/trunk_staging/com.android.managedprovisioning.flags/Android.bp
new file mode 100644
index 0000000..17a92af
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.managedprovisioning.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-platform_build_release-trunk_staging-com.android.managedprovisioning.flags-all",
+  package: "com.android.managedprovisioning.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto
new file mode 100644
index 0000000..122629e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.managedprovisioning.flags/bad_state_v3_early_rh_download_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.managedprovisioning.flags"
+  name: "bad_state_v3_early_rh_download_enabled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto
new file mode 100644
index 0000000..7349c26
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audio/equal_sco_lea_vc_index_range_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "equal_sco_lea_vc_index_range"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto
new file mode 100644
index 0000000..d7deda3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audio/ring_my_car_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "ring_my_car"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto
new file mode 100644
index 0000000..69b0fe3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audio/stereo_spatialization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audio"
+  name: "stereo_spatialization"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto
new file mode 100644
index 0000000..079f59e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audioserver/effect_chain_callback_improve_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "effect_chain_callback_improve"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
new file mode 100644
index 0000000..ee6bd85
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audioserver/fix_call_audio_patch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "fix_call_audio_patch"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto
new file mode 100644
index 0000000..158fc11
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audioserver/portid_volume_management_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "portid_volume_management"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto
new file mode 100644
index 0000000..21d2228
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.audioserver/power_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.audioserver"
+  name: "power_stats"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto b/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
new file mode 100644
index 0000000..e52557f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.media.flags/enable_full_scan_with_media_content_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.media.flags"
+  name: "enable_full_scan_with_media_content_control"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.net.ct.flags/Android.bp b/aconfig/trunk_staging/com.android.net.ct.flags/Android.bp
new file mode 100644
index 0000000..7ab0c72
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.ct.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-platform_build_release-trunk_staging-com.android.net.ct.flags-all",
+  package: "com.android.net.ct.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto b/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto
new file mode 100644
index 0000000..19d676b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.ct.flags/certificate_transparency_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.ct.flags"
+  name: "certificate_transparency_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto b/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto
new file mode 100644
index 0000000..a1c91c9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.flags/netstats_add_entries_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.flags"
+  name: "netstats_add_entries"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto
new file mode 100644
index 0000000..cf00f20
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.thread.flags/channel_max_powers_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.thread.flags"
+  name: "channel_max_powers_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto
new file mode 100644
index 0000000..76957a7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.thread.flags/configuration_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.thread.flags"
+  name: "configuration_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto
new file mode 100644
index 0000000..21a56fd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.net.thread.platform.flags/thread_user_restriction_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.net.thread.platform.flags"
+  name: "thread_user_restriction_enabled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
new file mode 100644
index 0000000..20ffd5c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.nfc.flags/auto_disable_observe_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "auto_disable_observe_mode"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto
new file mode 100644
index 0000000..45d3ab2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.nfc.flags/enable_direct_boot_aware_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "enable_direct_boot_aware"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto
new file mode 100644
index 0000000..faffa75
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.nfc.flags/observe_mode_without_rf_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "observe_mode_without_rf"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto b/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto
new file mode 100644
index 0000000..57532a4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.nfc.flags/send_view_intent_for_url_tag_dispatch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.nfc.flags"
+  name: "send_view_intent_for_url_tag_dispatch"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.org.conscrypt/Android.bp b/aconfig/trunk_staging/com.android.org.conscrypt/Android.bp
new file mode 100644
index 0000000..b935a12
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.org.conscrypt/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-platform_build_release-trunk_staging-com.android.org.conscrypt-all",
+  package: "com.android.org.conscrypt",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/Android.bp b/aconfig/trunk_staging/com.android.os.statsd.flags/Android.bp
new file mode 100644
index 0000000..8e250d0
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.os.statsd.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-platform_build_release-trunk_staging-com.android.os.statsd.flags-all",
+  package: "com.android.os.statsd.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto
new file mode 100644
index 0000000..7eb0c9a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.os.statsd.flags/trigger_uprobestats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.os.statsd.flags"
+  name: "trigger_uprobestats"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto b/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto
new file mode 100644
index 0000000..de17e75
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.os.statsd.flags/use_wait_for_service_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.os.statsd.flags"
+  name: "use_wait_for_service_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
new file mode 100644
index 0000000..ffca5cf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/add_banners_to_privacy_sensitive_apps_for_aaos_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "add_banners_to_privacy_sensitive_apps_for_aaos"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto
new file mode 100644
index 0000000..9bfa61a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/app_permission_fragment_uses_preferences_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "app_permission_fragment_uses_preferences"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto
new file mode 100644
index 0000000..e70469d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/livedata_refactor_permission_timeline_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "livedata_refactor_permission_timeline_enabled"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto
new file mode 100644
index 0000000..04eece3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/odad_notifications_supported_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "odad_notifications_supported"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto
new file mode 100644
index 0000000..bea4bdb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/safety_center_enabled_no_device_config_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "safety_center_enabled_no_device_config"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto b/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto
new file mode 100644
index 0000000..ea18cf3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.permission.flags/safety_center_issue_only_affects_group_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.permission.flags"
+  name: "safety_center_issue_only_affects_group_status"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto
new file mode 100644
index 0000000..14bf6f3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/audio_sample_columns_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "audio_sample_columns"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto
new file mode 100644
index 0000000..aff2707
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/enable_embedded_photopicker_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "enable_embedded_photopicker"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto
new file mode 100644
index 0000000..65bfd16
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/enable_oem_metadata_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "enable_oem_metadata"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto
new file mode 100644
index 0000000..f8749b1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/enable_stable_uris_for_external_primary_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "enable_stable_uris_for_external_primary_volume"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto
new file mode 100644
index 0000000..2332703
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/inferred_media_date_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "inferred_media_date"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto
new file mode 100644
index 0000000..e1bf01a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/media_cognition_service_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "media_cognition_service"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto
new file mode 100644
index 0000000..4cd68a1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/media_store_open_file_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "media_store_open_file"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto
new file mode 100644
index 0000000..d5e8cbd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.media.flags/picker_pre_selection_extra_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.media.flags"
+  name: "picker_pre_selection_extra"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
new file mode 100644
index 0000000..a9ebaa5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.settings/ignore_xml_for_read_only_flags_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "ignore_xml_for_read_only_flags"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/storage_test_mission_1_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/storage_test_mission_1_flag_values.textproto
deleted file mode 100644
index 61a935a..0000000
--- a/aconfig/trunk_staging/com.android.providers.settings/storage_test_mission_1_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "storage_test_mission_1"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto
new file mode 100644
index 0000000..fa0d8d5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.settings/support_local_overrides_sysprops_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "support_local_overrides_sysprops"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/support_overrides_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/support_overrides_flag_values.textproto
deleted file mode 100644
index c6bdd62..0000000
--- a/aconfig/trunk_staging/com.android.providers.settings/support_overrides_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.providers.settings"
-  name: "support_overrides"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto b/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto
new file mode 100644
index 0000000..3eaa9e4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.providers.settings/sync_local_overrides_removal_new_storage_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.providers.settings"
+  name: "sync_local_overrides_removal_new_storage"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto b/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto
new file mode 100644
index 0000000..7569db9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.sdksandbox.flags/service_restriction_package_name_logic_updated_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.sdksandbox.flags"
+  name: "service_restriction_package_name_logic_updated"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
new file mode 100644
index 0000000..99192a5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.accessibility/always_allow_observing_touch_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "always_allow_observing_touch_events"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_flag_values.textproto
new file mode 100644
index 0000000..7115ef9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_follows_mouse_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "enable_magnification_follows_mouse"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto
new file mode 100644
index 0000000..e7bdca1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.accessibility/enable_magnification_keyboard_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.accessibility"
+  name: "enable_magnification_keyboard_control"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto b/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
new file mode 100644
index 0000000..bf2fbd3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.alarm/start_user_before_scheduled_alarms_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.alarm"
+  name: "start_user_before_scheduled_alarms"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto
new file mode 100644
index 0000000..1d571a1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.am/collect_logcat_on_run_synchronously_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "collect_logcat_on_run_synchronously"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto
new file mode 100644
index 0000000..e47d2c0
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.am/defer_binders_when_paused_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "defer_binders_when_paused"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.am/defer_outgoing_broadcasts_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/defer_outgoing_broadcasts_flag_values.textproto
deleted file mode 100644
index b78f575..0000000
--- a/aconfig/trunk_staging/com.android.server.am/defer_outgoing_broadcasts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.am"
-  name: "defer_outgoing_broadcasts"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
new file mode 100644
index 0000000..2b58350
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.am/enable_dropbox_watchdog_headers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "enable_dropbox_watchdog_headers"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
new file mode 100644
index 0000000..3caa8df
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.am/log_broadcast_sent_event_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "log_broadcast_sent_event"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto b/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
new file mode 100644
index 0000000..9e2f2b5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.am/trace_update_app_freeze_state_lsp_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.am"
+  name: "trace_update_app_freeze_state_lsp"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
new file mode 100644
index 0000000..38baa81
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.biometrics/notify_fingerprints_loe_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.biometrics"
+  name: "notify_fingerprints_loe"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto b/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
new file mode 100644
index 0000000..028a1e2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.biometrics/set_ignore_speed_up_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.biometrics"
+  name: "set_ignore_speed_up"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp b/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
deleted file mode 100644
index 4816259..0000000
--- a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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-platform_build_release-trunk_staging-com.android.server.companion.virtual-all",
-  package: "com.android.server.companion.virtual",
-  srcs: [
-    "*_flag_values.textproto",
-  ]
-}
diff --git a/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto b/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto
deleted file mode 100644
index 4679801..0000000
--- a/aconfig/trunk_staging/com.android.server.companion.virtual/dump_history_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.companion.virtual"
-  name: "dump_history"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp b/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
new file mode 100644
index 0000000..15aca73
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.deviceidle/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-platform_build_release-trunk_staging-com.android.server.deviceidle-all",
+  package: "com.android.server.deviceidle",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto b/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
new file mode 100644
index 0000000..9e478b1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.deviceidle/remove_idle_location_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.deviceidle"
+  name: "remove_idle_location"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
new file mode 100644
index 0000000..3597ae2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/doze_brightness_float_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "doze_brightness_float"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto
new file mode 100644
index 0000000..f2e1bf8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/enable_battery_stats_for_all_displays_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "enable_battery_stats_for_all_displays"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto
new file mode 100644
index 0000000..7b9b8f4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/highest_hdr_sdr_ratio_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "highest_hdr_sdr_ratio_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
new file mode 100644
index 0000000..b865574
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/idle_screen_config_in_subscribing_light_sensor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "idle_screen_config_in_subscribing_light_sensor"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto
new file mode 100644
index 0000000..18a08d1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/new_hdr_brightness_modifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "new_hdr_brightness_modifier"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto
new file mode 100644
index 0000000..93a657a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/normal_brightness_for_doze_parameter_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "normal_brightness_for_doze_parameter"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto b/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
new file mode 100644
index 0000000..6c385f9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/offload_session_cancel_block_screen_on_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.display.feature.flags"
+  name: "offload_session_cancel_block_screen_on"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
new file mode 100644
index 0000000..8aec2fb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.flags/consolidate_battery_change_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "consolidate_battery_change_events"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
new file mode 100644
index 0000000..332c3f5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.flags/modifier_shortcut_manager_multiuser_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "modifier_shortcut_manager_multiuser"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto
new file mode 100644
index 0000000..f7aec29
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.flags/optional_background_install_control_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "optional_background_install_control"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.flags/skip_home_art_pins_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/skip_home_art_pins_flag_values.textproto
deleted file mode 100644
index 57871ed..0000000
--- a/aconfig/trunk_staging/com.android.server.flags/skip_home_art_pins_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.flags"
-  name: "skip_home_art_pins"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
new file mode 100644
index 0000000..6d55633
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.flags/trace_battery_changed_broadcast_event_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.flags"
+  name: "trace_battery_changed_broadcast_event"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto
new file mode 100644
index 0000000..453c4fa
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.job/create_work_chain_by_default_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "create_work_chain_by_default"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto
new file mode 100644
index 0000000..3e15f42
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.job/remove_user_during_user_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "remove_user_during_user_switch"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto b/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
new file mode 100644
index 0000000..9439d76
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.job/use_correct_process_state_for_logging_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.job"
+  name: "use_correct_process_state_for_logging"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.net/use_different_delays_for_background_chain_flag_values.textproto b/aconfig/trunk_staging/com.android.server.net/use_different_delays_for_background_chain_flag_values.textproto
deleted file mode 100644
index c58967d..0000000
--- a/aconfig/trunk_staging/com.android.server.net/use_different_delays_for_background_chain_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.server.net"
-  name: "use_different_delays_for_background_chain"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto
new file mode 100644
index 0000000..f692ef3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_conversations_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "notification_force_group_conversations"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto
new file mode 100644
index 0000000..2ebfa64
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.notification/notification_force_group_singletons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "notification_force_group_singletons"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto b/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto
new file mode 100644
index 0000000..06b9c92
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.notification/notification_vibration_in_sound_uri_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.notification"
+  name: "notification_vibration_in_sound_uri"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
new file mode 100644
index 0000000..6a8f979
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.feature.flags/improve_wakelock_latency_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.feature.flags"
+  name: "improve_wakelock_latency"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
new file mode 100644
index 0000000..9c7a81e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.hint/adpf_session_tag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.hint"
+  name: "adpf_session_tag"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
new file mode 100644
index 0000000..5c6f554
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.optimization/add_battery_usage_stats_slice_atom_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "add_battery_usage_stats_slice_atom"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto
new file mode 100644
index 0000000..4def078
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.optimization/battery_stats_screen_state_event_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "battery_stats_screen_state_event"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
new file mode 100644
index 0000000..a74d8c7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.optimization/battery_usage_stats_by_power_and_screen_state_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "battery_usage_stats_by_power_and_screen_state"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto b/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
new file mode 100644
index 0000000..4c51d2f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.power.optimization/streamlined_misc_battery_stats_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.power.optimization"
+  name: "streamlined_misc_battery_stats"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.powerstats/Android.bp b/aconfig/trunk_staging/com.android.server.powerstats/Android.bp
new file mode 100644
index 0000000..725bb21
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.powerstats/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-platform_build_release-trunk_staging-com.android.server.powerstats-all",
+  package: "com.android.server.powerstats",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto b/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
new file mode 100644
index 0000000..7eb7727
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.powerstats/verify_non_null_arguments_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.powerstats"
+  name: "verify_non_null_arguments"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto b/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
new file mode 100644
index 0000000..70ec766
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.stats/apply_network_stats_poll_rate_limit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.stats"
+  name: "apply_network_stats_poll_rate_limit"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
new file mode 100644
index 0000000..969266b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/cache_call_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "cache_call_events"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto
new file mode 100644
index 0000000..c7d7dfb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/check_completed_filters_on_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "check_completed_filters_on_timeout"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto
new file mode 100644
index 0000000..5e03c88
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/disconnect_self_managed_stuck_startup_calls_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "disconnect_self_managed_stuck_startup_calls"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto
new file mode 100644
index 0000000..6a72a9e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/do_not_send_call_to_null_ics_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "do_not_send_call_to_null_ics"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto
new file mode 100644
index 0000000..c8553cf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/ensure_in_car_ringing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "ensure_in_car_ringing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
new file mode 100644
index 0000000..7b4f55e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/on_call_endpoint_changed_ics_on_connected_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "on_call_endpoint_changed_ics_on_connected"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
new file mode 100644
index 0000000..f3b0e79
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/transactional_hold_disconnects_unholdable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "transactional_hold_disconnects_unholdable"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto
new file mode 100644
index 0000000..184d770
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/unregister_unresolvable_accounts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "unregister_unresolvable_accounts"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto
new file mode 100644
index 0000000..e03c774
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/use_refactored_audio_route_switching_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_refactored_audio_route_switching"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto b/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
new file mode 100644
index 0000000..e4e32fb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/use_stream_voice_call_tones_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.telecom.flags"
+  name: "use_stream_voice_call_tones"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.updates/Android.bp b/aconfig/trunk_staging/com.android.server.updates/Android.bp
new file mode 100644
index 0000000..06e1ebf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.updates/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-platform_build_release-trunk_staging-com.android.server.updates-all",
+  package: "com.android.server.updates",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto
new file mode 100644
index 0000000..b0dac92
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.updates/certificate_transparency_installer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.updates"
+  name: "certificate_transparency_installer"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto b/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto
new file mode 100644
index 0000000..9d11410
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.server.utils/anr_timer_freezer_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.server.utils"
+  name: "anr_timer_freezer"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto
deleted file mode 100644
index 81a3ea0..0000000
--- a/aconfig/trunk_staging/com.android.settings.accessibility/add_brightness_settings_in_suw_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.accessibility"
-  name: "add_brightness_settings_in_suw"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
new file mode 100644
index 0000000..69f7bc9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.accessibility/audio_balance_state_description_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "audio_balance_state_description"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
new file mode 100644
index 0000000..5bea132
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.accessibility/check_prebundled_is_preinstalled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "check_prebundled_is_preinstalled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto
new file mode 100644
index 0000000..dacfb66
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.accessibility/fix_a11y_settings_search_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "fix_a11y_settings_search"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
new file mode 100644
index 0000000..4093d40
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.accessibility/never_restrict_accessibility_activity_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.accessibility"
+  name: "never_restrict_accessibility_activity"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
new file mode 100644
index 0000000..2a7fbc3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/accessibility_appearance_settings_backup_enabled_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "accessibility_appearance_settings_backup_enabled"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto
new file mode 100644
index 0000000..79e3406
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/catalyst_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "catalyst"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
new file mode 100644
index 0000000..6f38eb3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/disable_bonding_cancellation_for_orientation_change_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "disable_bonding_cancellation_for_orientation_change"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto
new file mode 100644
index 0000000..718963f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_device_details_polish_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_bluetooth_device_details_polish"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto
new file mode 100644
index 0000000..a09ce63
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_key_missing_dialog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_bluetooth_key_missing_dialog"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto
deleted file mode 100644
index df9bd22..0000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_bluetooth_profile_toggle_visibility_checker_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_bluetooth_profile_toggle_visibility_checker"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
deleted file mode 100644
index 9fcf560..0000000
--- a/aconfig/trunk_staging/com.android.settings.flags/enable_subsequent_pair_settings_integration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "enable_subsequent_pair_settings_integration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto
new file mode 100644
index 0000000..b2f3879
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/enable_wifi_sharing_runtime_fragment_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "enable_wifi_sharing_runtime_fragment"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
new file mode 100644
index 0000000..eaa8d98
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/exclude_webcam_auth_challenge_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "exclude_webcam_auth_challenge"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
deleted file mode 100644
index 8fe2949..0000000
--- a/aconfig/trunk_staging/com.android.settings.flags/hide_le_audio_toggle_for_le_audio_only_device_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "hide_le_audio_toggle_for_le_audio_only_device"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto
deleted file mode 100644
index 34d6947..0000000
--- a/aconfig/trunk_staging/com.android.settings.flags/internet_preference_controller_v2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settings.flags"
-  name: "internet_preference_controller_v2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto
new file mode 100644
index 0000000..4d613b8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/resolution_and_enable_connected_display_setting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "resolution_and_enable_connected_display_setting"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
new file mode 100644
index 0000000..80eaae9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/rotation_connected_display_setting_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "rotation_connected_display_setting"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
new file mode 100644
index 0000000..7070bdc
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settings.flags/support_raw_dynamic_icons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settings.flags"
+  name: "support_raw_dynamic_icons"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settings.flags/updated_suggestion_card_aosp_flag_values.textproto b/aconfig/trunk_staging/com.android.settings.flags/updated_suggestion_card_aosp_flag_values.textproto
new file mode 100644
index 0000000..27fdbf8
--- /dev/null
+++ b/aconfig/trunk_staging/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_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/allow_all_widgets_on_lockscreen_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/allow_all_widgets_on_lockscreen_by_default_flag_values.textproto
deleted file mode 100644
index c1a9981..0000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/allow_all_widgets_on_lockscreen_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "allow_all_widgets_on_lockscreen_by_default"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto
new file mode 100644
index 0000000..dde036c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/asha_profile_access_profile_enabled_true_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "asha_profile_access_profile_enabled_true"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto
deleted file mode 100644
index 518035e..0000000
--- a/aconfig/trunk_staging/com.android.settingslib.flags/enable_cached_bluetooth_device_dedup_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.settingslib.flags"
-  name: "enable_cached_bluetooth_device_dedup"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
new file mode 100644
index 0000000..936ba16
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/enable_determining_spatial_audio_attributes_by_profile_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "enable_determining_spatial_audio_attributes_by_profile"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
new file mode 100644
index 0000000..d0dfbc5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/extreme_power_low_state_vulnerability_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "extreme_power_low_state_vulnerability"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto
new file mode 100644
index 0000000..975fef1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/volume_dialog_audio_sharing_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "volume_dialog_audio_sharing_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
new file mode 100644
index 0000000..bf7d2a3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/volume_panel_broadcast_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.flags"
+  name: "volume_panel_broadcast_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/Android.bp
new file mode 100644
index 0000000..e841df8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.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-platform_build_release-trunk_staging-com.android.settingslib.widget.selectorwithwidgetpreference.flags-all",
+  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
new file mode 100644
index 0000000..221d953
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.settingslib.widget.selectorwithwidgetpreference.flags/allow_set_title_max_lines_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags"
+  name: "allow_set_title_max_lines"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
new file mode 100644
index 0000000..9b3ff01
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/action_bar_wrap_content_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.accessibility.accessibilitymenu"
+  name: "action_bar_wrap_content"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
new file mode 100644
index 0000000..b254534
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/hide_restricted_actions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.accessibility.accessibilitymenu"
+  name: "hide_restricted_actions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
new file mode 100644
index 0000000..049ac4d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui.car/show_qc_sound_panel_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.car"
+  name: "show_qc_sound_panel"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto
new file mode 100644
index 0000000..f3237f7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui.shared/new_touchpad_gestures_tutorial_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui.shared"
+  name: "new_touchpad_gestures_tutorial"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
new file mode 100644
index 0000000..fed058d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/add_black_background_for_window_magnifier_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "add_black_background_for_window_magnifier"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto
new file mode 100644
index 0000000..dcefc7a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/app_clips_backlinks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "app_clips_backlinks"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto
new file mode 100644
index 0000000..7741e2c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/bp_icon_a11y_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "bp_icon_a11y"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto
deleted file mode 100644
index fa54496..0000000
--- a/aconfig/trunk_staging/com.android.systemui/bp_talkback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "bp_talkback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto
deleted file mode 100644
index b743da8..0000000
--- a/aconfig/trunk_staging/com.android.systemui/centralized_status_bar_height_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "centralized_status_bar_height_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto
new file mode 100644
index 0000000..d606d7f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/classic_flags_multi_user_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "classic_flags_multi_user"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto
new file mode 100644
index 0000000..9deb38f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/clipboard_image_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "clipboard_image_timeout"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
new file mode 100644
index 0000000..cb3ce63
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/clipboard_noninteractive_on_lockscreen_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "clipboard_noninteractive_on_lockscreen"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto
new file mode 100644
index 0000000..ff9dc26
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/clipboard_shared_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "clipboard_shared_transitions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
new file mode 100644
index 0000000..2f75218
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/communal_bouncer_do_not_modify_plugin_open_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_bouncer_do_not_modify_plugin_open"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto
new file mode 100644
index 0000000..66abd0d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/communal_edit_widgets_activity_finish_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_edit_widgets_activity_finish_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
new file mode 100644
index 0000000..9d6dc78
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/communal_scene_ktf_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_scene_ktf_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
new file mode 100644
index 0000000..157e6cf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/communal_timer_flicker_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_timer_flicker_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
new file mode 100644
index 0000000..883c2d7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/communal_widget_trampoline_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "communal_widget_trampoline_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto
deleted file mode 100644
index f7a579d..0000000
--- a/aconfig/trunk_staging/com.android.systemui/constraint_bp_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "constraint_bp"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_frequency_check_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_frequency_check_flag_values.textproto
deleted file mode 100644
index da4aa33..0000000
--- a/aconfig/trunk_staging/com.android.systemui/disable_contextual_tips_frequency_check_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "disable_contextual_tips_frequency_check"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
new file mode 100644
index 0000000..18a50fd
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/dream_input_session_pilfer_once_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "dream_input_session_pilfer_once"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto
new file mode 100644
index 0000000..bdfc3b4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/enable_contextual_tip_for_mute_volume_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "enable_contextual_tip_for_mute_volume"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto
new file mode 100644
index 0000000..67f7ee0
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/expand_heads_up_on_inline_reply_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "expand_heads_up_on_inline_reply"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto
new file mode 100644
index 0000000..7a6b60e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/face_message_defer_update_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "face_message_defer_update"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto
new file mode 100644
index 0000000..24cb66c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/faster_unlock_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "faster_unlock_transition"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
new file mode 100644
index 0000000..c4e2945
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/fetch_bookmarks_xml_keyboard_shortcuts_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "fetch_bookmarks_xml_keyboard_shortcuts"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto
deleted file mode 100644
index d9c76f8..0000000
--- a/aconfig/trunk_staging/com.android.systemui/haptic_brightness_slider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "haptic_brightness_slider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto
deleted file mode 100644
index 753b373..0000000
--- a/aconfig/trunk_staging/com.android.systemui/haptic_volume_slider_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "haptic_volume_slider"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto
new file mode 100644
index 0000000..563854b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/keyboard_shortcut_helper_rewrite_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "keyboard_shortcut_helper_rewrite"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto
new file mode 100644
index 0000000..c205b13
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/keyboard_touchpad_contextual_education_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "keyboard_touchpad_contextual_education"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto
new file mode 100644
index 0000000..d86d3b7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/media_controls_drawables_reuse_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_controls_drawables_reuse"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
new file mode 100644
index 0000000..343e52c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/media_controls_posts_optimization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_controls_posts_optimization"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_controls_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_controls_refactor_flag_values.textproto
deleted file mode 100644
index 5d74361..0000000
--- a/aconfig/trunk_staging/com.android.systemui/media_controls_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "media_controls_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
new file mode 100644
index 0000000..e5035d1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/media_load_metadata_via_media_data_loader_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_load_metadata_via_media_data_loader"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
new file mode 100644
index 0000000..de02f0d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/media_lockscreen_launch_animation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "media_lockscreen_launch_animation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto
new file mode 100644
index 0000000..0292f23
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/msdl_feedback_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "msdl_feedback"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto
new file mode 100644
index 0000000..fa298d3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/non_touchscreen_devices_bypass_falsing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "non_touchscreen_devices_bypass_falsing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_background_tint_optimization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_background_tint_optimization_flag_values.textproto
deleted file mode 100644
index 75fdc37..0000000
--- a/aconfig/trunk_staging/com.android.systemui/notification_background_tint_optimization_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notification_background_tint_optimization"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
new file mode 100644
index 0000000..6b54c08
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/notification_transparent_header_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notification_transparent_header_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/notifications_heads_up_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notifications_heads_up_refactor_flag_values.textproto
deleted file mode 100644
index 6da386f..0000000
--- a/aconfig/trunk_staging/com.android.systemui/notifications_heads_up_refactor_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "notifications_heads_up_refactor"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto
new file mode 100644
index 0000000..0d3179e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/notify_password_text_view_user_activity_in_background_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "notify_password_text_view_user_activity_in_background"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto
deleted file mode 100644
index d38aafd..0000000
--- a/aconfig/trunk_staging/com.android.systemui/privacy_dot_unfold_wrong_corner_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "privacy_dot_unfold_wrong_corner_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto
deleted file mode 100644
index b9db0e3..0000000
--- a/aconfig/trunk_staging/com.android.systemui/pss_app_selector_abrupt_exit_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "pss_app_selector_abrupt_exit_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto
deleted file mode 100644
index 7d585d0..0000000
--- a/aconfig/trunk_staging/com.android.systemui/qs_new_pipeline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "qs_new_pipeline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
new file mode 100644
index 0000000..4277120
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/qs_register_setting_observer_on_bg_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "qs_register_setting_observer_on_bg_thread"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto
new file mode 100644
index 0000000..3e103ef
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/qs_ui_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "qs_ui_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto
new file mode 100644
index 0000000..e04fe41
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/redesign_magnification_window_size_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "redesign_magnification_window_size"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto
new file mode 100644
index 0000000..12ea9e6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/register_content_observers_async_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "register_content_observers_async"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
new file mode 100644
index 0000000..22058d0
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/relock_with_power_button_immediately_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "relock_with_power_button_immediately"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
new file mode 100644
index 0000000..aff40aa
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/remove_update_listener_in_qs_icon_view_impl_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "remove_update_listener_in_qs_icon_view_impl"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
new file mode 100644
index 0000000..45ed38e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/save_and_restore_magnification_settings_buttons_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "save_and_restore_magnification_settings_buttons"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto
deleted file mode 100644
index 19345a5..0000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_accessibility_announcement_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_private_profile_accessibility_announcement_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto
deleted file mode 100644
index 901a995..0000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_private_profile_behavior_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_private_profile_behavior_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto
deleted file mode 100644
index 9070838..0000000
--- a/aconfig/trunk_staging/com.android.systemui/screenshot_shelf_ui2_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "screenshot_shelf_ui2"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto
new file mode 100644
index 0000000..f53533b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/screenshot_ui_controller_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "screenshot_ui_controller_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
new file mode 100644
index 0000000..206076c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/settings_ext_register_content_observer_on_bg_thread_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "settings_ext_register_content_observer_on_bg_thread"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto
new file mode 100644
index 0000000..3a00b24
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/sim_pin_bouncer_reset_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sim_pin_bouncer_reset"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
new file mode 100644
index 0000000..8d8829e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/sim_pin_race_condition_on_restart_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sim_pin_race_condition_on_restart"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
new file mode 100644
index 0000000..6c151f2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/sim_pin_talkback_fix_for_double_submit_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sim_pin_talkback_fix_for_double_submit"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
new file mode 100644
index 0000000..948cb9c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/smartspace_remoteviews_rendering_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "smartspace_remoteviews_rendering_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto
new file mode 100644
index 0000000..0c1e0f2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/sounddose_customization_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "sounddose_customization"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
new file mode 100644
index 0000000..39ff849
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/status_bar_always_check_underlying_networks_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_always_check_underlying_networks"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
new file mode 100644
index 0000000..d8c7740
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/status_bar_call_chip_notification_icon_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_call_chip_notification_icon"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto
new file mode 100644
index 0000000..355e2a8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/status_bar_signal_policy_refactor_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_signal_policy_refactor"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
new file mode 100644
index 0000000..e1c3874
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/status_bar_switch_to_spn_from_data_spn_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_switch_to_spn_from_data_spn"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
new file mode 100644
index 0000000..0dbce5c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/status_bar_use_repos_for_call_chip_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "status_bar_use_repos_for_call_chip"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
new file mode 100644
index 0000000..d8d5bcc
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/translucent_occluding_activity_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "translucent_occluding_activity_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto
deleted file mode 100644
index d43a77e..0000000
--- a/aconfig/trunk_staging/com.android.systemui/truncated_status_bar_icons_fix_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.systemui"
-  name: "truncated_status_bar_icons_fix"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
new file mode 100644
index 0000000..afe9aad
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/use_transitions_for_keyguard_occluded_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "use_transitions_for_keyguard_occluded"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto b/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto
new file mode 100644
index 0000000..76e7788
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.systemui/use_volume_controller_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.systemui"
+  name: "use_volume_controller"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto
new file mode 100644
index 0000000..fee9228
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.text.flags/clear_font_variation_settings_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "clear_font_variation_settings"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
new file mode 100644
index 0000000..1ab7e5d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.text.flags/context_menu_hide_unavailable_items_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "context_menu_hide_unavailable_items"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto
deleted file mode 100644
index da2950d..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/deprecate_ui_fonts_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "deprecate_ui_fonts"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto
deleted file mode 100644
index 00bdace..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_double_underline_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_double_underline"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto
deleted file mode 100644
index ce27820..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_font_update_failure_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_font_update_failure"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto
deleted file mode 100644
index 7b4476a..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/fix_misaligned_context_menu_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "fix_misaligned_context_menu"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto
deleted file mode 100644
index f592eba..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/icu_bidi_migration_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "icu_bidi_migration"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
new file mode 100644
index 0000000..6b08c37
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.text.flags/insert_mode_crash_update_layout_span_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "insert_mode_crash_update_layout_span"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto
new file mode 100644
index 0000000..714741b
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.text.flags/insert_mode_highlight_range_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "insert_mode_highlight_range"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto
deleted file mode 100644
index 98b9d3a..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/lazy_variation_instance_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "lazy_variation_instance"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto
deleted file mode 100644
index 714c437..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/phrase_strict_fallback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "phrase_strict_fallback"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto
new file mode 100644
index 0000000..6629fd6
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.text.flags/rust_hyphenator_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.text.flags"
+  name: "rust_hyphenator"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto b/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto
deleted file mode 100644
index 5958a97..0000000
--- a/aconfig/trunk_staging/com.android.text.flags/vendor_custom_locale_fallback_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.text.flags"
-  name: "vendor_custom_locale_fallback"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp
new file mode 100644
index 0000000..6e57a65
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/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-platform_build_release-trunk_staging-com.android.trunk_stable_workflow_testing-all",
+  package: "com.android.trunk_stable_workflow_testing",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto
new file mode 100644
index 0000000..d59227e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/test_migrate_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.trunk_stable_workflow_testing"
+  name: "test_migrate_flag"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto
new file mode 100644
index 0000000..e75506d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wallpaper/refactor_wallpaper_category_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wallpaper"
+  name: "refactor_wallpaper_category_flag"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto
new file mode 100644
index 0000000..c1b4d73
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/get_bssid_blocklist_api_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "get_bssid_blocklist_api"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto
new file mode 100644
index 0000000..e4581f9
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/new_uri_parsing_for_escape_character_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "new_uri_parsing_for_escape_character"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/p2p_ownership_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/p2p_ownership_flag_values.textproto
new file mode 100644
index 0000000..b5a0d64
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/p2p_ownership_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "p2p_ownership"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto
new file mode 100644
index 0000000..acfe8a8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/rsn_overriding_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "rsn_overriding"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto
new file mode 100644
index 0000000..620b456
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/softap_config_store_max_channel_width_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "softap_config_store_max_channel_width"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto
new file mode 100644
index 0000000..30fc3e5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_bugfix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wifi.flags"
+  name: "voip_detection_bugfix"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_flag_values.textproto b/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_flag_values.textproto
deleted file mode 100644
index e9b9dc1..0000000
--- a/aconfig/trunk_staging/com.android.wifi.flags/voip_detection_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.wifi.flags"
-  name: "voip_detection"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
new file mode 100644
index 0000000..39e6cd8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/activity_embedding_animation_customization_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "activity_embedding_animation_customization_flag"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto
deleted file mode 100644
index a680151..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_snapshot_by_default_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_snapshot_by_default"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto
deleted file mode 100644
index edda505..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/activity_window_info_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "activity_window_info_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto
new file mode 100644
index 0000000..54c07e4
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/ae_back_stack_restore_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "ae_back_stack_restore"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto
new file mode 100644
index 0000000..b4b7944
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/always_capture_activity_snapshot_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "always_capture_activity_snapshot"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto
deleted file mode 100644
index 1ca35a8..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/always_defer_transition_when_apply_wct_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "always_defer_transition_when_apply_wct"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
new file mode 100644
index 0000000..8ab6402
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/avoid_rebinding_intentionally_disconnected_wallpaper_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "avoid_rebinding_intentionally_disconnected_wallpaper"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto
new file mode 100644
index 0000000..c308f37
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/bal_additional_start_modes_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_additional_start_modes"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto
new file mode 100644
index 0000000..274690d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/bal_reduce_grace_period_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_reduce_grace_period"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto
new file mode 100644
index 0000000..29b1157
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/bal_send_intent_with_options_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "bal_send_intent_with_options"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto
deleted file mode 100644
index 221b52f..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/bundle_client_transaction_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "bundle_client_transaction_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto
new file mode 100644
index 0000000..e6aebf8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/camera_compat_fullscreen_pick_same_task_activity_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "camera_compat_fullscreen_pick_same_task_activity"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto
deleted file mode 100644
index 38314f2..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/defer_display_updates_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "defer_display_updates"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto
new file mode 100644
index 0000000..8c12ea1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/disable_non_resizable_app_snap_resizing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "disable_non_resizable_app_snap_resizing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto
deleted file mode 100644
index d335d06..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/disable_object_pool_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "disable_object_pool"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
new file mode 100644
index 0000000..a49224c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/draw_snapshot_aspect_ratio_match_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "draw_snapshot_aspect_ratio_match"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto
deleted file mode 100644
index 01993cb..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/embedded_activity_back_nav_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "embedded_activity_back_nav_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto
new file mode 100644
index 0000000..25be11e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_always_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_caption_compat_inset_force_consumption_always"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto
new file mode 100644
index 0000000..c396dbf
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_caption_compat_inset_force_consumption_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_caption_compat_inset_force_consumption"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto
new file mode 100644
index 0000000..0bf8fe2
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_cascading_windows_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_cascading_windows"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto
new file mode 100644
index 0000000..3854753
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_compat_ui_visibility_status_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_compat_ui_visibility_status"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto
new file mode 100644
index 0000000..404e56f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_back_navigation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_back_navigation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto
new file mode 100644
index 0000000..600ab4f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_multi_instance_features_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_multi_instance_features"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto
new file mode 100644
index 0000000..598c273
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_persistence_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_persistence"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto
new file mode 100644
index 0000000..96212eb
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_quick_switch_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_quick_switch"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_flag_values.textproto
new file mode 100644
index 0000000..9fc9c6e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_scvh_cache_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_scvh_cache"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto
new file mode 100644
index 0000000..cbf3d96
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_size_constraints_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_size_constraints"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto
new file mode 100644
index 0000000..4581d8a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_transitions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto
new file mode 100644
index 0000000..d364a1e
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_desktop_windowing_wallpaper_activity_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_desktop_windowing_wallpaper_activity"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto
new file mode 100644
index 0000000..693c6f7
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_handle_input_fix_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_handle_input_fix"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto
new file mode 100644
index 0000000..d86e9ed
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_hold_to_drag_app_handle_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_hold_to_drag_app_handle"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto
new file mode 100644
index 0000000..d542753
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_minimize_button_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_minimize_button"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto
new file mode 100644
index 0000000..aa7bc7a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_dynamic_initial_bounds_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_windowing_dynamic_initial_bounds"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto
new file mode 100644
index 0000000..193e4ab
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_edge_drag_resize_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_windowing_edge_drag_resize"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto
new file mode 100644
index 0000000..ebf33d1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_scaled_resizing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_windowing_scaled_resizing"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto
new file mode 100644
index 0000000..53d9284
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/enable_windowing_transition_handlers_observers_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "enable_windowing_transition_handlers_observers"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto
new file mode 100644
index 0000000..6668a09
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "ensure_wallpaper_in_transitions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto
new file mode 100644
index 0000000..d1e43a8
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/ensure_wallpaper_in_wear_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "ensure_wallpaper_in_wear_transitions"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto
deleted file mode 100644
index ff9c4fd..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/fix_pip_restore_to_overlay_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fix_pip_restore_to_overlay"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto
deleted file mode 100644
index a76cae4..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/fullscreen_dim_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "fullscreen_dim_flag"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto
new file mode 100644
index 0000000..565d166
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/insets_control_seq_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "insets_control_seq"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto
deleted file mode 100644
index 1703ca3..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/keyguard_appear_transition_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "keyguard_appear_transition"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto
new file mode 100644
index 0000000..81fa93d
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/keyguard_going_away_timeout_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "keyguard_going_away_timeout"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
new file mode 100644
index 0000000..f1acd32
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/migrate_predictive_back_transition_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "migrate_predictive_back_transition"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
new file mode 100644
index 0000000..e7fe32c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/no_duplicate_surface_destroyed_events_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "no_duplicate_surface_destroyed_events"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
new file mode 100644
index 0000000..2aad3ad
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/process_priority_policy_for_multi_window_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "process_priority_policy_for_multi_window_mode"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto
new file mode 100644
index 0000000..9e23726
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/reduce_keyguard_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "reduce_keyguard_transitions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto
deleted file mode 100644
index 1c847d9..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/remove_prepare_surface_in_placement_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "remove_prepare_surface_in_placement"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto
new file mode 100644
index 0000000..117dcfa
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/remove_starting_window_wait_for_multi_transitions_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "remove_starting_window_wait_for_multi_transitions"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto
new file mode 100644
index 0000000..4341cfe
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/respect_non_top_visible_fixed_orientation_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "respect_non_top_visible_fixed_orientation"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
new file mode 100644
index 0000000..90d06ac
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/respect_orientation_change_for_unresizeable_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "respect_orientation_change_for_unresizeable"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/scrolling_from_letterbox_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/scrolling_from_letterbox_flag_values.textproto
new file mode 100644
index 0000000..368ee3f
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/scrolling_from_letterbox_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "scrolling_from_letterbox"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
new file mode 100644
index 0000000..cd548d1
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/show_desktop_windowing_dev_option_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "show_desktop_windowing_dev_option"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto
new file mode 100644
index 0000000..225df0a
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/skip_compat_ui_education_in_desktop_mode_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "skip_compat_ui_education_in_desktop_mode"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto
deleted file mode 100644
index 27654d8..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/skip_sleeping_when_switching_display_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "skip_sleeping_when_switching_display"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
new file mode 100644
index 0000000..17a43a3
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/system_ui_immersive_confirmation_dialog_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "system_ui_immersive_confirmation_dialog"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto
new file mode 100644
index 0000000..3cb8ffa
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/transit_tracker_plumbing_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "transit_tracker_plumbing"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
new file mode 100644
index 0000000..80074b5
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.window.flags/use_tasks_dim_only_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.window.flags"
+  name: "use_tasks_dim_only"
+  state: ENABLED
+  permission: READ_ONLY
+}
diff --git a/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto
deleted file mode 100644
index 8ab8a12..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/window_session_relayout_info_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "window_session_relayout_info"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto b/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto
deleted file mode 100644
index e5ec454..0000000
--- a/aconfig/trunk_staging/com.android.window.flags/window_token_config_thread_safe_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.android.window.flags"
-  name: "window_token_config_thread_safe"
-  state: ENABLED
-  permission: READ_WRITE
-}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
new file mode 100644
index 0000000..dddde56
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wm.shell/bubble_view_info_executors_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "bubble_view_info_executors"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto
new file mode 100644
index 0000000..df9108c
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wm.shell/enable_bubble_bar_in_persistent_task_bar_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "enable_bubble_bar_in_persistent_task_bar"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/enable_taskbar_on_phones_flag_values.textproto
new file mode 100644
index 0000000..b99a0bc
--- /dev/null
+++ b/aconfig/trunk_staging/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: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto b/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
new file mode 100644
index 0000000..fcf1125
--- /dev/null
+++ b/aconfig/trunk_staging/com.android.wm.shell/only_reuse_bubbled_task_when_launched_from_bubble_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.android.wm.shell"
+  name: "only_reuse_bubbled_task_when_launched_from_bubble"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/read_only_flag_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/read_only_flag_flag_values.textproto
deleted file mode 100644
index 61a07f2..0000000
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/read_only_flag_flag_values.textproto
+++ /dev/null
@@ -1,6 +0,0 @@
-flag_value {
-  package: "com.example.android.aconfig.demo.flags"
-  name: "read_only_flag"
-  state: ENABLED
-  permission: READ_ONLY
-}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/test_mendel_gantry_disintegration_again_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/test_mendel_gantry_disintegration_again_flag_values.textproto
new file mode 100644
index 0000000..682eb41
--- /dev/null
+++ b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/test_mendel_gantry_disintegration_again_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.example.android.aconfig.demo.flags"
+  name: "test_mendel_gantry_disintegration_again"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto
new file mode 100644
index 0000000..1bbc63d
--- /dev/null
+++ b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/yet_another_mendel_gantry_disintegration_flag_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.example.android.aconfig.demo.flags"
+  name: "yet_another_mendel_gantry_disintegration_flag"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto b/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto
new file mode 100644
index 0000000..2502af8
--- /dev/null
+++ b/aconfig/trunk_staging/com.google.android.iwlan.flags/validate_underlying_network_on_no_response_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "com.google.android.iwlan.flags"
+  name: "validate_underlying_network_on_no_response"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/Android.bp b/aconfig/trunk_staging/libgooglecamerahal.flags/Android.bp
new file mode 100644
index 0000000..8aabae6
--- /dev/null
+++ b/aconfig/trunk_staging/libgooglecamerahal.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-platform_build_release-trunk_staging-libgooglecamerahal.flags-all",
+  package: "libgooglecamerahal.flags",
+  srcs: [
+    "*_flag_values.textproto",
+  ]
+}
diff --git a/aconfig/trunk_staging/libgooglecamerahal.flags/zsl_video_denoise_in_hwl_flag_values.textproto b/aconfig/trunk_staging/libgooglecamerahal.flags/zsl_video_denoise_in_hwl_flag_values.textproto
new file mode 100644
index 0000000..5d74fc6
--- /dev/null
+++ b/aconfig/trunk_staging/libgooglecamerahal.flags/zsl_video_denoise_in_hwl_flag_values.textproto
@@ -0,0 +1,6 @@
+flag_value {
+  package: "libgooglecamerahal.flags"
+  name: "zsl_video_denoise_in_hwl"
+  state: ENABLED
+  permission: READ_WRITE
+}
diff --git a/build_config/ap2a.scl b/build_config/ap2a.scl
new file mode 100644
index 0000000..c80badb
--- /dev/null
+++ b/build_config/ap2a.scl
@@ -0,0 +1,46 @@
+"""
+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");
+# 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>-next-<variant>` builds
+#                                                      ^^^^
+# See go/build-system-flags
+#
+
+load("//build/make/core/release_config.scl", "value")
+
+# Flags should be alphabetical by flag name to reduce merge conflifcts
+values = [
+    # keep-sorted start numeric=yes
+    value("RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION", "READ_ONLY"),
+    value("RELEASE_ACONFIG_VALUE_SETS", "aconfig_value_set-aosp-ap2a"),
+    value("RELEASE_AIDL_USE_UNFROZEN", False),
+    value("RELEASE_BOARD_API_LEVEL", "202404"),
+    value("RELEASE_BUILD_FLAGS_IN_PROTOBUF", False),
+    value("RELEASE_DEPRECATE_VNDK", True),
+    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "11"),
+    value("RELEASE_PLATFORM_SDK_VERSION", "34"),
+    value("RELEASE_PLATFORM_SECURITY_PATCH", "2024-09-05"),
+    value("RELEASE_PLATFORM_VERSION", "UP1A"),
+    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
diff --git a/build_config/ap2a=make b/build_config/ap2a=make
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/build_config/ap2a=make
diff --git a/flag_declarations/RELEASE_APPFUNCTION_SIDECAR.textproto b/flag_declarations/RELEASE_APPFUNCTION_SIDECAR.textproto
new file mode 100644
index 0000000..cf5ce26
--- /dev/null
+++ b/flag_declarations/RELEASE_APPFUNCTION_SIDECAR.textproto
@@ -0,0 +1,5 @@
+name: "RELEASE_APPFUNCTION_SIDECAR"
+namespace: "machine_learning"
+description: "Release flag for appfunction sidecar jar"
+workflow: LAUNCH
+containers: "system_ext"
diff --git a/flag_declarations/RELEASE_BASE_OS_AKITA.textproto b/flag_declarations/RELEASE_BASE_OS_AKITA.textproto
new file mode 100644
index 0000000..fb2840b
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_AKITA.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_AKITA"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for AKITArelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_BLUEJAY.textproto b/flag_declarations/RELEASE_BASE_OS_BLUEJAY.textproto
new file mode 100644
index 0000000..06a3c11
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_BLUEJAY.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_BLUEJAY"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for BLUEJAYrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_CHEETAH.textproto b/flag_declarations/RELEASE_BASE_OS_CHEETAH.textproto
new file mode 100644
index 0000000..760a489
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_CHEETAH.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_CHEETAH"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for CHEETAHrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_FELIX.textproto b/flag_declarations/RELEASE_BASE_OS_FELIX.textproto
new file mode 100644
index 0000000..60aee70
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_FELIX.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_FELIX"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for FELIXrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_HUSKY.textproto b/flag_declarations/RELEASE_BASE_OS_HUSKY.textproto
new file mode 100644
index 0000000..7c63062
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_HUSKY.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_HUSKY"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for HUSKYrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_LYNX.textproto b/flag_declarations/RELEASE_BASE_OS_LYNX.textproto
new file mode 100644
index 0000000..d538dfa
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_LYNX.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_LYNX"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for LYNXrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_ORIOLE.textproto b/flag_declarations/RELEASE_BASE_OS_ORIOLE.textproto
new file mode 100644
index 0000000..8b42c00
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_ORIOLE.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_ORIOLE"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for ORIOLErelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_PANTHER.textproto b/flag_declarations/RELEASE_BASE_OS_PANTHER.textproto
new file mode 100644
index 0000000..2bba9ab
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_PANTHER.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_PANTHER"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for PANTHERrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_RAVEN.textproto b/flag_declarations/RELEASE_BASE_OS_RAVEN.textproto
new file mode 100644
index 0000000..8a74367
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_RAVEN.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_RAVEN"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for RAVENrelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_SHIBA.textproto b/flag_declarations/RELEASE_BASE_OS_SHIBA.textproto
new file mode 100644
index 0000000..f17d3e8
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_SHIBA.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_SHIBA"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for SHIBArelease build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_BASE_OS_TANGORPRO.textproto b/flag_declarations/RELEASE_BASE_OS_TANGORPRO.textproto
new file mode 100644
index 0000000..a604582
--- /dev/null
+++ b/flag_declarations/RELEASE_BASE_OS_TANGORPRO.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_BASE_OS_TANGORPRO"
+namespace: "android_UNKNOWN"
+description: "Use this flag to set ro.build.version.base_os or ro.build.version.emergency_base_os for TANGORPRO release build. The value is set to the last approved build for the device. This is required for the SMR/EMR build to be recognized by the Partner Approvals portal."
+value: {
+  string_value: ""
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_ETM_IN_USERDEBUG_ENG.textproto b/flag_declarations/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
new file mode 100644
index 0000000..8600b2c
--- /dev/null
+++ b/flag_declarations/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
@@ -0,0 +1,8 @@
+name: "RELEASE_ETM_IN_USERDEBUG_ENG"
+namespace: "android_platform_llvm_and_toolchains"
+description: "Add ETM modules in userdebug/eng build"
+value: {
+  bool_value: false
+}
+workflow: LAUNCH
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_IS_EMR.textproto b/flag_declarations/RELEASE_IS_EMR.textproto
new file mode 100644
index 0000000..f1c054d
--- /dev/null
+++ b/flag_declarations/RELEASE_IS_EMR.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_IS_EMR"
+namespace: "android_UNKNOWN"
+description: "Set this flag to true to mark a release build as EMR (Emergency Maintenance Release)."
+value: {
+  bool_value: false
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_IS_SMR.textproto b/flag_declarations/RELEASE_IS_SMR.textproto
new file mode 100644
index 0000000..fc9cf64
--- /dev/null
+++ b/flag_declarations/RELEASE_IS_SMR.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_IS_SMR"
+namespace: "android_UNKNOWN"
+description: "Set this flag to true to mark a release build as SMR (Security Maintenance Release)."
+value: {
+  bool_value: false
+}
+workflow: MANUAL
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_LAUNCHER_USE_COMPOSE.textproto b/flag_declarations/RELEASE_LAUNCHER_USE_COMPOSE.textproto
new file mode 100644
index 0000000..23f7a32
--- /dev/null
+++ b/flag_declarations/RELEASE_LAUNCHER_USE_COMPOSE.textproto
@@ -0,0 +1,9 @@
+name: "RELEASE_ENABLE_COMPOSE_IN_LAUNCHER"
+namespace: "launcher"
+description: "b/346290823: Flag to enable Jetpack Compose dependencies in Launcher."
+value: {
+  bool_value: false
+}
+workflow: LAUNCH
+containers: "system"
+
diff --git a/flag_declarations/RELEASE_UPROBESTATS_MODULE.textproto b/flag_declarations/RELEASE_UPROBESTATS_MODULE.textproto
new file mode 100644
index 0000000..9f60f70
--- /dev/null
+++ b/flag_declarations/RELEASE_UPROBESTATS_MODULE.textproto
@@ -0,0 +1,11 @@
+name: "RELEASE_UPROBESTATS_MODULE"
+namespace: "android_UNKNOWN"
+description: "If true, then uprobestats module is enabled as an apex"
+value: {
+  bool_value: false
+}
+workflow: LAUNCH
+containers: "product"
+containers: "system"
+containers: "system_ext"
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_WLAN_CM4KM4TK4_FW_DIR.textproto b/flag_declarations/RELEASE_WLAN_CM4KM4TK4_FW_DIR.textproto
new file mode 100644
index 0000000..84ebc41
--- /dev/null
+++ b/flag_declarations/RELEASE_WLAN_CM4KM4TK4_FW_DIR.textproto
@@ -0,0 +1,8 @@
+name: "RELEASE_WLAN_CM4KM4TK4_FW_DIR"
+namespace: "android_UNKNOWN"
+description: ""
+value: {
+  string_value: "."
+}
+workflow: PREBUILT
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_WLAN_CT3_FW_DIR.textproto b/flag_declarations/RELEASE_WLAN_CT3_FW_DIR.textproto
new file mode 100644
index 0000000..e64d630
--- /dev/null
+++ b/flag_declarations/RELEASE_WLAN_CT3_FW_DIR.textproto
@@ -0,0 +1,8 @@
+name: "RELEASE_WLAN_CT3_FW_DIR"
+namespace: "android_UNKNOWN"
+description: ""
+value: {
+  string_value: "."
+}
+workflow: PREBUILT
+containers: "vendor"
diff --git a/flag_declarations/RELEASE_WLAN_HK3SB3_FW_DIR.textproto b/flag_declarations/RELEASE_WLAN_HK3SB3_FW_DIR.textproto
new file mode 100644
index 0000000..c429032
--- /dev/null
+++ b/flag_declarations/RELEASE_WLAN_HK3SB3_FW_DIR.textproto
@@ -0,0 +1,8 @@
+name: "RELEASE_WLAN_HK3SB3_FW_DIR"
+namespace: "android_UNKNOWN"
+description: ""
+value: {
+  string_value: "."
+}
+workflow: PREBUILT
+containers: "vendor"
diff --git a/flag_values/ap2a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto b/flag_values/ap2a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto
new file mode 100644
index 0000000..aeffb82
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_ACONFIG_FLAG_DEFAULT_PERMISSION"
+value: {
+  string_value: "READ_ONLY"
+}
diff --git a/flag_values/ap2a/RELEASE_AIDL_USE_UNFROZEN.textproto b/flag_values/ap2a/RELEASE_AIDL_USE_UNFROZEN.textproto
new file mode 100644
index 0000000..a4243df
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_AIDL_USE_UNFROZEN.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_AIDL_USE_UNFROZEN"
+value: {
+  bool_value: false
+}
diff --git a/flag_values/ap2a/RELEASE_BOARD_API_LEVEL.textproto b/flag_values/ap2a/RELEASE_BOARD_API_LEVEL.textproto
new file mode 100644
index 0000000..5b9e36f
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_BOARD_API_LEVEL.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_BOARD_API_LEVEL"
+value: {
+  string_value: "202404"
+}
diff --git a/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto b/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
new file mode 100644
index 0000000..8889462
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_BUILD_FLAGS_IN_PROTOBUF.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_BUILD_FLAGS_IN_PROTOBUF"
+value: {
+  bool_value: false
+}
diff --git a/flag_values/ap2a/RELEASE_PACKAGE_LIBSQLITE3.textproto b/flag_values/ap2a/RELEASE_PACKAGE_LIBSQLITE3.textproto
new file mode 100644
index 0000000..dac3891
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PACKAGE_LIBSQLITE3.textproto
@@ -0,0 +1,4 @@
+name:  "RELEASE_PACKAGE_LIBSQLITE3"
+value:  {
+  string_value:  "3440300"
+}
\ No newline at end of file
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto b/flag_values/ap2a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
new file mode 100644
index 0000000..9924ef7
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_SDK_EXTENSION_VERSION"
+value: {
+  string_value: "11"
+}
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
new file mode 100644
index 0000000..e1d2838
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_SECURITY_PATCH"
+value: {
+  string_value: "2024-09-05"
+}
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
new file mode 100644
index 0000000..ee5624e
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_CODENAMES.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_VERSION_ALL_CODENAMES"
+value: {
+  string_value: "REL"
+}
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
new file mode 100644
index 0000000..8b260e7
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_VERSION_ALL_PREVIEW_CODENAMES"
+value: {
+  string_value: "REL,VanillaIceCream"
+}
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_VERSION_CODENAME.textproto b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_CODENAME.textproto
new file mode 100644
index 0000000..6bba546
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_PLATFORM_VERSION_CODENAME.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_VERSION_CODENAME"
+value: {
+  string_value: "REL"
+}
diff --git a/flag_values/ap3a/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_AKITA_DIR.textproto
index d6253e6..3da5f42 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_AKITA_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_AKITA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_AKITA_DIR"
 value: {
-  string_value: "device/google/akita-kernels/5.15/24Q3-12065098"
+  string_value: "device/google/akita-kernels/5.15/24Q3-12357444"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
index 06f2752..df642b9 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_BLUEJAY_DIR"
 value: {
-  string_value: "device/google/bluejay-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/bluejay-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto
index fe3950c..e1085ea 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_CHEETAH_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_CHEETAH_DIR"
 value: {
-  string_value: "device/google/pantah-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/pantah-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto
index 3a13108..85f81b9 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_FELIX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_FELIX_DIR"
 value: {
-  string_value: "device/google/felix-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/felix-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto
index 03b8e2f..f4de003 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_HUSKY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_HUSKY_DIR"
 value: {
-  string_value: "device/google/shusky-kernels/5.15/24Q3-12065098"
+  string_value: "device/google/shusky-kernels/5.15/24Q3-12357444"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto
index 3a13559..d98fb48 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_LYNX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_LYNX_DIR"
 value: {
-  string_value: "device/google/lynx-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/lynx-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto
index 5b1cfb4..0ce36ae 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_ORIOLE_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_ORIOLE_DIR"
 value: {
-  string_value: "device/google/raviole-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/raviole-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto
index 0be8add..b49dc44 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_PANTHER_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_PANTHER_DIR"
 value: {
-  string_value: "device/google/pantah-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/pantah-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto
index bb9b33b..11bab4d 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_RAVEN_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_RAVEN_DIR"
 value: {
-  string_value: "device/google/raviole-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/raviole-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto
index edac628..add95e7 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_SHIBA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_SHIBA_DIR"
 value: {
-  string_value: "device/google/shusky-kernels/5.15/24Q3-12065098"
+  string_value: "device/google/shusky-kernels/5.15/24Q3-12357444"
 }
diff --git a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
index 898bd20..3daea01 100644
--- a/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ b/flag_values/ap3a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_TANGORPRO_DIR"
 value: {
-  string_value: "device/google/tangorpro-kernels/5.10/24Q3-12115410"
+  string_value: "device/google/tangorpro-kernels/5.10/24Q3-12357445"
 }
diff --git a/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
index e1d2838..ce29523 100644
--- a/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ b/flag_values/ap3a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_PLATFORM_SECURITY_PATCH"
 value: {
-  string_value: "2024-09-05"
+  string_value: "2024-11-05"
 }
diff --git a/flag_values/ap4a/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto b/flag_values/ap4a/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
new file mode 100644
index 0000000..8b97f2d
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/ap4a/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto b/flag_values/ap4a/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
new file mode 100644
index 0000000..7a40dcc
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/ap4a/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto b/flag_values/ap4a/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
new file mode 100644
index 0000000..5057404
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_AKITA_DIR.textproto
new file mode 100644
index 0000000..40b5463
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_AKITA_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_AKITA_DIR"
+value: {
+  string_value: "device/google/akita-kernels/5.15/24Q4-12506254"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_AKITA_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_AKITA_VERSION.textproto
new file mode 100644
index 0000000..93f7de3
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_AKITA_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_AKITA_VERSION"
+value: {
+  string_value: "5.15"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
new file mode 100644
index 0000000..3d44686
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_BLUEJAY_DIR"
+value: {
+  string_value: "device/google/bluejay-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
new file mode 100644
index 0000000..07f1917
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_BLUEJAY_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_CAIMAN_DIR.textproto
new file mode 100644
index 0000000..1df450a
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_CAIMAN_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_CAIMAN_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/24Q4-12561933"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_DIR.textproto
new file mode 100644
index 0000000..3ddeeb5
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_CHEETAH_DIR"
+value: {
+  string_value: "device/google/pantah-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_VERSION.textproto
new file mode 100644
index 0000000..fcb91b8
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_CHEETAH_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_CHEETAH_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_COMET_DIR.textproto
new file mode 100644
index 0000000..383dd05
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_COMET_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_COMET_DIR"
+value: {
+  string_value: "device/google/comet-kernels/6.1/24Q4-12561933"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_FELIX_DIR.textproto
new file mode 100644
index 0000000..d781399
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_FELIX_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_FELIX_DIR"
+value: {
+  string_value: "device/google/felix-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_FELIX_VERSION.textproto
new file mode 100644
index 0000000..05ffa7f
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_FELIX_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_FELIX_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_HUSKY_DIR.textproto
new file mode 100644
index 0000000..5705f98
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_HUSKY_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_HUSKY_DIR"
+value: {
+  string_value: "device/google/shusky-kernels/5.15/24Q4-12506254"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_HUSKY_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_HUSKY_VERSION.textproto
new file mode 100644
index 0000000..19a08ff
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_HUSKY_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_HUSKY_VERSION"
+value: {
+  string_value: "5.15"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_KOMODO_DIR.textproto
new file mode 100644
index 0000000..d2f18bc
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_KOMODO_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_KOMODO_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/24Q4-12561933"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_LYNX_DIR.textproto
new file mode 100644
index 0000000..e15625d
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_LYNX_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_LYNX_DIR"
+value: {
+  string_value: "device/google/lynx-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_LYNX_VERSION.textproto
new file mode 100644
index 0000000..3e2d971
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_LYNX_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_LYNX_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_DIR.textproto
new file mode 100644
index 0000000..63f778f
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_ORIOLE_DIR"
+value: {
+  string_value: "device/google/raviole-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_VERSION.textproto
new file mode 100644
index 0000000..10cebd2
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_ORIOLE_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_ORIOLE_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_PANTHER_DIR.textproto
new file mode 100644
index 0000000..b678dfb
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_PANTHER_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_PANTHER_DIR"
+value: {
+  string_value: "device/google/pantah-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_PANTHER_VERSION.textproto
new file mode 100644
index 0000000..7b0203f
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_PANTHER_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_PANTHER_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_RAVEN_DIR.textproto
new file mode 100644
index 0000000..f2c6442
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RAVEN_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RAVEN_DIR"
+value: {
+  string_value: "device/google/raviole-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RAVEN_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_RAVEN_VERSION.textproto
new file mode 100644
index 0000000..89c747d
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RAVEN_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RAVEN_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
new file mode 100644
index 0000000..878767b
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENT24_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-11986258"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
new file mode 100644
index 0000000..b24ec2c
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENTPRO_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-11986258"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
new file mode 100644
index 0000000..e814061
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENT_DIR"
+value: {
+  string_value: "device/google/shusky-kernels/5.15/trunk-12010660"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
new file mode 100644
index 0000000..9c3a269
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
+value: {
+  string_value: "5.15"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_SHIBA_DIR.textproto
new file mode 100644
index 0000000..c64f47b
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_SHIBA_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_SHIBA_DIR"
+value: {
+  string_value: "device/google/shusky-kernels/5.15/24Q4-12506254"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_SHIBA_VERSION.textproto
new file mode 100644
index 0000000..9ef0f38
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_SHIBA_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_SHIBA_VERSION"
+value: {
+  string_value: "5.15"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
new file mode 100644
index 0000000..b462bf0
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_TANGORPRO_DIR"
+value: {
+  string_value: "device/google/tangorpro-kernels/5.10/24Q4-12476354"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
new file mode 100644
index 0000000..2b8cf8b
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_TANGORPRO_VERSION"
+value: {
+  string_value: "5.10"
+}
diff --git a/flag_values/ap4a/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/ap4a/RELEASE_KERNEL_TOKAY_DIR.textproto
new file mode 100644
index 0000000..5b6f8db
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_KERNEL_TOKAY_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_TOKAY_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/24Q4-12561933"
+}
diff --git a/flag_values/ap4a/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto b/flag_values/ap4a/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
new file mode 100644
index 0000000..ae7d1bc
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/ap4a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto b/flag_values/ap4a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
new file mode 100644
index 0000000..e6dcb43
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_SDK_EXTENSION_VERSION"
+value: {
+  string_value: "15"
+}
diff --git a/flag_values/ap4a/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/ap4a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
new file mode 100644
index 0000000..aa4104a
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_PLATFORM_SECURITY_PATCH"
+value: {
+  string_value: "2024-12-05"
+}
\ No newline at end of file
diff --git a/flag_values/ap4a/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto b/flag_values/ap4a/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
new file mode 100644
index 0000000..8f9fa82
--- /dev/null
+++ b/flag_values/ap4a/RELEASE_SELINUX_DATA_DATA_IGNORE.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_SELINUX_DATA_DATA_IGNORE"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto b/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
new file mode 100644
index 0000000..87beb96
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_APPFUNCTION_SIDECAR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_APPFUNCTION_SIDECAR"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
index ed85ec5..eaacdcc 100644
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
+++ b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE.textproto
@@ -1,4 +1,4 @@
-name:  "RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"
-value:  {
-  bool_value:  true
+name: "RELEASE_AVF_ENABLE_TPU_ASSIGNABLE_DEVICE"
+value: {
+  bool_value: true
 }
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
deleted file mode 100644
index ffdabf9..0000000
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_WIDEVINE_PVM.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_ENABLE_WIDEVINE_PVM"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
index 9c3ca6b..2973d17 100644
--- a/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
+++ b/flag_values/trunk_staging/RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS.textproto
@@ -1,4 +1,4 @@
-name:  "RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS"
-value:  {
-  bool_value:  true
+name: "RELEASE_AVF_IMPROVE_DEBUGGABLE_VMS"
+value: {
+  bool_value: true
 }
diff --git a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto b/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
deleted file mode 100644
index 4805025..0000000
--- a/flag_values/trunk_staging/RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_AVF_SUPPORT_LONG_RUNNING_VMS"
-value:  {
-  bool_value:  true
-}
diff --git a/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto b/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
new file mode 100644
index 0000000..de851fc
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_ETM_IN_USERDEBUG_ENG.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_ETM_IN_USERDEBUG_ENG"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto b/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
new file mode 100644
index 0000000..8b97f2d
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION"
+value: {
+  bool_value: true
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
index 077c6f4..e7b5ebd 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_AKITA_DIR"
 value: {
-  string_value: "device/google/akita-kernels/5.15/trunk-11967919"
+  string_value: "device/google/akita-kernels/6.1/trunk-12398767"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
index 93f7de3..2543b33 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_AKITA_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_AKITA_VERSION"
 value: {
-  string_value: "5.15"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
index 3d08e75..1bbc609 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_BLUEJAY_DIR"
 value: {
-  string_value: "device/google/bluejay-kernels/5.10/trunk-11969182"
+  string_value: "device/google/bluejay-kernels/6.1/trunk-12398767"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
index 07f1917..963d174 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_BLUEJAY_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_BLUEJAY_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
new file mode 100644
index 0000000..5c56f86
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_CAIMAN_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_CAIMAN_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-12398767"
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
index 4247cf9..fa2b648 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_CHEETAH_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_CHEETAH_DIR"
 value: {
-  string_value: "device/google/pantah-kernels/5.10/trunk-11970631"
+  string_value: "device/google/pantah-kernels/6.1/trunk-12402432"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
new file mode 100644
index 0000000..6aadc48
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_COMET_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_COMET_DIR"
+value: {
+  string_value: "device/google/comet-kernels/6.1/trunk-12398767"
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
index 9ee63b5..143f0d0 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_FELIX_DIR"
 value: {
-  string_value: "device/google/felix-kernels/5.10/trunk-11969182"
+  string_value: "device/google/felix-kernels/6.1/trunk-12398767"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
index 05ffa7f..34b51f4 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_FELIX_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_FELIX_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
index 28795ef..a45d916 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_HUSKY_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_HUSKY_DIR"
 value: {
-  string_value: "device/google/shusky-kernels/5.15/trunk-11970630"
+  string_value: "device/google/shusky-kernels/6.1/trunk-12394889"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
new file mode 100644
index 0000000..8926ac2
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_KOMODO_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_KOMODO_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-12398767"
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
index 8e7931c..39cc035 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_LYNX_DIR"
 value: {
-  string_value: "device/google/lynx-kernels/5.10/trunk-11969182"
+  string_value: "device/google/lynx-kernels/6.1/trunk-12398767"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
index 3e2d971..b306617 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_LYNX_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_LYNX_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
index 5cd9424..c8be82a 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_ORIOLE_DIR"
 value: {
-  string_value: "device/google/raviole-kernels/5.10/trunk-11969182"
+  string_value: "device/google/raviole-kernels/6.1/trunk-12394889"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
index 10cebd2..cf1bb60 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_ORIOLE_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_ORIOLE_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
index efb1f78..33112d8 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_PANTHER_DIR"
 value: {
-  string_value: "device/google/pantah-kernels/5.10/trunk-11970631"
+  string_value: "device/google/pantah-kernels/6.1/trunk-12402432"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
index 7b0203f..539e171 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_PANTHER_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_PANTHER_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
index 1faf516..01ba936 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RAVEN_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_RAVEN_DIR"
 value: {
-  string_value: "device/google/raviole-kernels/5.10/trunk-11969182"
+  string_value: "device/google/raviole-kernels/6.1/trunk-12394889"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
new file mode 100644
index 0000000..d3f4ec6
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT24_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENT24_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-11970169"
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
new file mode 100644
index 0000000..b90c4e5
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENTPRO_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_RIPCURRENTPRO_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-11970169"
+}
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
index a14c16d..cf0919d 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_RIPCURRENT_DIR"
 value: {
-  string_value: "device/google/shusky-kernels/5.15/trunk-11928432"
+  string_value: "device/google/shusky-kernels/6.1/trunk-12394889"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
index 9c3a269..d717768 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_RIPCURRENT_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_RIPCURRENT_VERSION"
 value: {
-  string_value: "5.15"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
index 5c91ba3..d1d67a3 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_SHIBA_DIR"
 value: {
-  string_value: "device/google/shusky-kernels/5.15/trunk-11970630"
+  string_value: "device/google/shusky-kernels/6.1/trunk-12394889"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
index 9ef0f38..aeaa0b3 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_SHIBA_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_SHIBA_VERSION"
 value: {
-  string_value: "5.15"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
index 5f36caf..01f9d58 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_DIR.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_TANGORPRO_DIR"
 value: {
-  string_value: "device/google/tangorpro-kernels/5.10/trunk-11969182"
+  string_value: "device/google/tangorpro-kernels/6.1/trunk-12398767"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
index 2b8cf8b..2763aaf 100644
--- a/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_TANGORPRO_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_KERNEL_TANGORPRO_VERSION"
 value: {
-  string_value: "5.10"
+  string_value: "6.1"
 }
diff --git a/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto b/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
new file mode 100644
index 0000000..02ea841
--- /dev/null
+++ b/flag_values/trunk_staging/RELEASE_KERNEL_TOKAY_DIR.textproto
@@ -0,0 +1,4 @@
+name: "RELEASE_KERNEL_TOKAY_DIR"
+value: {
+  string_value: "device/google/caimito-kernels/6.1/trunk-12398767"
+}
diff --git a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto b/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
index 97e354b..162f55f 100644
--- a/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
+++ b/flag_values/trunk_staging/RELEASE_LIBBINDER_CLIENT_CACHE.textproto
@@ -1,4 +1,4 @@
-name:  "RELEASE_LIBBINDER_CLIENT_CACHE"
-value:  {
-  bool_value:  true
+name: "RELEASE_LIBBINDER_CLIENT_CACHE"
+value: {
+  bool_value: true
 }
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
index 2fe10c7..e6dcb43 100644
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
+++ b/flag_values/trunk_staging/RELEASE_PLATFORM_SDK_EXTENSION_VERSION.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_PLATFORM_SDK_EXTENSION_VERSION"
 value: {
-  string_value: "13"
+  string_value: "15"
 }
diff --git a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
index 4ece17c..ce29523 100644
--- a/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ b/flag_values/trunk_staging/RELEASE_PLATFORM_SECURITY_PATCH.textproto
@@ -1,4 +1,4 @@
 name: "RELEASE_PLATFORM_SECURITY_PATCH"
 value: {
-  string_value: "2024-08-05"
+  string_value: "2024-11-05"
 }
diff --git a/release_config_map.textproto b/release_config_map.textproto
index 44f7d71..6a4f2c2 100644
--- a/release_config_map.textproto
+++ b/release_config_map.textproto
@@ -1,6 +1,6 @@
 aliases: {
   name: "aosp_current"
-  target: "ap3a"
+  target: "ap4a"
 }
 default_containers: "product"
 default_containers: "system"
diff --git a/release_configs/ap2a.textproto b/release_configs/ap2a.textproto
new file mode 100644
index 0000000..d88da08
--- /dev/null
+++ b/release_configs/ap2a.textproto
@@ -0,0 +1,2 @@
+name: "ap2a"
+aconfig_value_sets: "aconfig_value_set-aosp-ap2a"
diff --git a/release_configs/ap4a.textproto b/release_configs/ap4a.textproto
new file mode 100644
index 0000000..52644dc
--- /dev/null
+++ b/release_configs/ap4a.textproto
@@ -0,0 +1,3 @@
+name: "ap4a"
+inherits: "ap3a"
+aconfig_value_sets: "aconfig_value_set-platform_build_release-ap4a"