DO NOT MERGE ANYWHERE Crunch ap2a build flags

Also clean up spacing, and add `aosp_current` alias (== `ap2a`).

Bug: 341899531
Bug: 328495189
Test: manual
Ignore-AOSP-First: internal-first process
Change-Id: I648f91daf7cd50d1bfbd8e1ded1131abbc04173e

195 files changed, 393 insertions, 389 deletions

diff --git a/aconfig/ap2a/Android.bp b/aconfig/ap2a/Android.bp
index c21c14d8..f8b4e0e4 100644
--- a/aconfig/ap2a/Android.bp
+++ b/aconfig/ap2a/Android.bp
@@ -13,58 +13,58 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-aosp-ap2a",
+    name: "aconfig_value_set-platform_build_release-ap2a",
     values: [
-      "aconfig-values-aosp-ap2a-com.android.internal.camera.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.permission.flags-all",
-      "aconfig-values-aosp-ap2a-android.speech.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.media.audio-all",
-      "aconfig-values-aosp-ap2a-android.credentials.flags-all",
-      "aconfig-values-aosp-ap2a-android.location.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.launcher3-all",
-      "aconfig-values-aosp-ap2a-android.app.admin.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.server.policy.feature.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.server.telecom.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.settings.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.settingslib.flags-all",
-      "aconfig-values-aosp-ap2a-android.security-all",
-      "aconfig-values-aosp-ap2a-com.android.systemui-all",
-      "aconfig-values-aosp-ap2a-com.android.window.flags-all",
-      "aconfig-values-aosp-ap2a-android.view.accessibility-all",
-      "aconfig-values-aosp-ap2a-com.google.android.iwlan.flags-all",
-      "aconfig-values-aosp-ap2a-android.view.flags-all",
-      "aconfig-values-aosp-ap2a-android.service.notification-all",
-      "aconfig-values-aosp-ap2a-com.android.graphics.surfaceflinger.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.input.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.intentresolver-all",
-      "aconfig-values-aosp-ap2a-com.android.server.backup-all",
-      "aconfig-values-aosp-ap2a-android.app.usage-all",
-      "aconfig-values-aosp-ap2a-android.view.contentcapture.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.text.flags-all",
-      "aconfig-values-aosp-ap2a-android.view.contentprotection.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.deviceaswebcam.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.media.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.bluetooth.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.sdksandbox.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.server.notification-all",
-      "aconfig-values-aosp-ap2a-android.chre.flags-all",
-      "aconfig-values-aosp-ap2a-android.os.vibrator-all",
-      "aconfig-values-aosp-ap2a-android.content.pm-all",
-      "aconfig-values-aosp-ap2a-com.android.aconfig.test-all",
-      "aconfig-values-aosp-ap2a-android.widget.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.hardware.input-all",
-      "aconfig-values-aosp-ap2a-android.service.chooser-all",
-      "aconfig-values-aosp-ap2a-com.android.internal.telephony.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.uwb.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.server.job-all",
-      "aconfig-values-aosp-ap2a-com.android.server.flags-all",
-      "aconfig-values-aosp-ap2a-android.app-all",
-      "aconfig-values-aosp-ap2a-com.android.server.accessibility-all",
-      "aconfig-values-aosp-ap2a-android.permission.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.media.playback.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.server.companion.virtual-all",
-      "aconfig-values-aosp-ap2a-android.os-all",
-      "aconfig-values-aosp-ap2a-com.android.server.display.feature.flags-all",
-      "aconfig-values-aosp-ap2a-com.android.wm.shell-all"
+      "aconfig-values-platform_build_release-ap2a-com.android.internal.camera.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.permission.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.speech.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.media.audio-all",
+      "aconfig-values-platform_build_release-ap2a-android.credentials.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.location.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.launcher3-all",
+      "aconfig-values-platform_build_release-ap2a-android.app.admin.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.policy.feature.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.telecom.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.settingslib.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.security-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.systemui-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.window.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.view.accessibility-all",
+      "aconfig-values-platform_build_release-ap2a-com.google.android.iwlan.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.view.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.service.notification-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.graphics.surfaceflinger.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.intentresolver-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.backup-all",
+      "aconfig-values-platform_build_release-ap2a-android.app.usage-all",
+      "aconfig-values-platform_build_release-ap2a-android.view.contentcapture.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.text.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.view.contentprotection.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.deviceaswebcam.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.media.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.bluetooth.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.sdksandbox.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.notification-all",
+      "aconfig-values-platform_build_release-ap2a-android.chre.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.os.vibrator-all",
+      "aconfig-values-platform_build_release-ap2a-android.content.pm-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.aconfig.test-all",
+      "aconfig-values-platform_build_release-ap2a-android.widget.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.hardware.input-all",
+      "aconfig-values-platform_build_release-ap2a-android.service.chooser-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.internal.telephony.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.uwb.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.job-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.flags-all",
+      "aconfig-values-platform_build_release-ap2a-android.app-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.accessibility-all",
+      "aconfig-values-platform_build_release-ap2a-android.permission.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.media.playback.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.companion.virtual-all",
+      "aconfig-values-platform_build_release-ap2a-android.os-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-ap2a-com.android.wm.shell-all"
     ]
 }
diff --git a/aconfig/ap2a/android.app.admin.flags/Android.bp b/aconfig/ap2a/android.app.admin.flags/Android.bp
index 5f3eb282..3ff335b8 100644
--- a/aconfig/ap2a/android.app.admin.flags/Android.bp
+++ b/aconfig/ap2a/android.app.admin.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.app.admin.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.app.admin.flags-all",
   package: "android.app.admin.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.app.usage/Android.bp b/aconfig/ap2a/android.app.usage/Android.bp
index 931fff9b..96074428 100644
--- a/aconfig/ap2a/android.app.usage/Android.bp
+++ b/aconfig/ap2a/android.app.usage/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.app.usage-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.app.usage-all",
   package: "android.app.usage",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.app/Android.bp b/aconfig/ap2a/android.app/Android.bp
index 211518a4..ab1ee2bc 100644
--- a/aconfig/ap2a/android.app/Android.bp
+++ b/aconfig/ap2a/android.app/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.app-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.app-all",
   package: "android.app",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.chre.flags/Android.bp b/aconfig/ap2a/android.chre.flags/Android.bp
index a9362546..32ba98de 100644
--- a/aconfig/ap2a/android.chre.flags/Android.bp
+++ b/aconfig/ap2a/android.chre.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.chre.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.chre.flags-all",
   package: "android.chre.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.content.pm/Android.bp b/aconfig/ap2a/android.content.pm/Android.bp
index 04c9db32..8be7992d 100644
--- a/aconfig/ap2a/android.content.pm/Android.bp
+++ b/aconfig/ap2a/android.content.pm/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.content.pm-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.content.pm-all",
   package: "android.content.pm",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.credentials.flags/Android.bp b/aconfig/ap2a/android.credentials.flags/Android.bp
index 49a42bfa..a22b4d71 100644
--- a/aconfig/ap2a/android.credentials.flags/Android.bp
+++ b/aconfig/ap2a/android.credentials.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.credentials.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.credentials.flags-all",
   package: "android.credentials.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.location.flags/Android.bp b/aconfig/ap2a/android.location.flags/Android.bp
index eb9d4111..cf922661 100644
--- a/aconfig/ap2a/android.location.flags/Android.bp
+++ b/aconfig/ap2a/android.location.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.location.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.location.flags-all",
   package: "android.location.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.os.vibrator/Android.bp b/aconfig/ap2a/android.os.vibrator/Android.bp
index 23740906..8735e553 100644
--- a/aconfig/ap2a/android.os.vibrator/Android.bp
+++ b/aconfig/ap2a/android.os.vibrator/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.os.vibrator-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.os.vibrator-all",
   package: "android.os.vibrator",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.os/Android.bp b/aconfig/ap2a/android.os/Android.bp
index b3b05bfb..1ca2b631 100644
--- a/aconfig/ap2a/android.os/Android.bp
+++ b/aconfig/ap2a/android.os/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.os-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.os-all",
   package: "android.os",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.permission.flags/Android.bp b/aconfig/ap2a/android.permission.flags/Android.bp
index ae79aa3a..c59abddd 100644
--- a/aconfig/ap2a/android.permission.flags/Android.bp
+++ b/aconfig/ap2a/android.permission.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.permission.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.permission.flags-all",
   package: "android.permission.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.security/Android.bp b/aconfig/ap2a/android.security/Android.bp
index 1608ebe4..15464f52 100644
--- a/aconfig/ap2a/android.security/Android.bp
+++ b/aconfig/ap2a/android.security/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.security-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.security-all",
   package: "android.security",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.service.chooser/Android.bp b/aconfig/ap2a/android.service.chooser/Android.bp
index cd99ddf8..9085e112 100644
--- a/aconfig/ap2a/android.service.chooser/Android.bp
+++ b/aconfig/ap2a/android.service.chooser/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.service.chooser-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.service.chooser-all",
   package: "android.service.chooser",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.service.notification/Android.bp b/aconfig/ap2a/android.service.notification/Android.bp
index 207af06d..70c3b531 100644
--- a/aconfig/ap2a/android.service.notification/Android.bp
+++ b/aconfig/ap2a/android.service.notification/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.service.notification-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.service.notification-all",
   package: "android.service.notification",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.speech.flags/Android.bp b/aconfig/ap2a/android.speech.flags/Android.bp
index d3be118d..a6a6d9b7 100644
--- a/aconfig/ap2a/android.speech.flags/Android.bp
+++ b/aconfig/ap2a/android.speech.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.speech.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.speech.flags-all",
   package: "android.speech.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.view.accessibility/Android.bp b/aconfig/ap2a/android.view.accessibility/Android.bp
index f9305f2d..b4a94e4e 100644
--- a/aconfig/ap2a/android.view.accessibility/Android.bp
+++ b/aconfig/ap2a/android.view.accessibility/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.view.accessibility-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.view.accessibility-all",
   package: "android.view.accessibility",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.view.contentcapture.flags/Android.bp b/aconfig/ap2a/android.view.contentcapture.flags/Android.bp
index 76d189f1..efbac8e2 100644
--- a/aconfig/ap2a/android.view.contentcapture.flags/Android.bp
+++ b/aconfig/ap2a/android.view.contentcapture.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.view.contentcapture.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.view.contentcapture.flags-all",
   package: "android.view.contentcapture.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.view.contentprotection.flags/Android.bp b/aconfig/ap2a/android.view.contentprotection.flags/Android.bp
index 4bbb56ed..57f57ab9 100644
--- a/aconfig/ap2a/android.view.contentprotection.flags/Android.bp
+++ b/aconfig/ap2a/android.view.contentprotection.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.view.contentprotection.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.view.contentprotection.flags-all",
   package: "android.view.contentprotection.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.view.flags/Android.bp b/aconfig/ap2a/android.view.flags/Android.bp
index c26512cc..f34c0725 100644
--- a/aconfig/ap2a/android.view.flags/Android.bp
+++ b/aconfig/ap2a/android.view.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.view.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.view.flags-all",
   package: "android.view.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/android.widget.flags/Android.bp b/aconfig/ap2a/android.widget.flags/Android.bp
index 97bd925e..c4faae7e 100644
--- a/aconfig/ap2a/android.widget.flags/Android.bp
+++ b/aconfig/ap2a/android.widget.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-android.widget.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-android.widget.flags-all",
   package: "android.widget.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.aconfig.test/Android.bp b/aconfig/ap2a/com.android.aconfig.test/Android.bp
index 41d970d1..8862e1c4 100644
--- a/aconfig/ap2a/com.android.aconfig.test/Android.bp
+++ b/aconfig/ap2a/com.android.aconfig.test/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.aconfig.test-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.aconfig.test-all",
   package: "com.android.aconfig.test",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.bluetooth.flags/Android.bp b/aconfig/ap2a/com.android.bluetooth.flags/Android.bp
index 5ad78342..e383f396 100644
--- a/aconfig/ap2a/com.android.bluetooth.flags/Android.bp
+++ b/aconfig/ap2a/com.android.bluetooth.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.bluetooth.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.bluetooth.flags-all",
   package: "com.android.bluetooth.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.deviceaswebcam.flags/Android.bp b/aconfig/ap2a/com.android.deviceaswebcam.flags/Android.bp
index ffdfc937..bbb18fc2 100644
--- a/aconfig/ap2a/com.android.deviceaswebcam.flags/Android.bp
+++ b/aconfig/ap2a/com.android.deviceaswebcam.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.deviceaswebcam.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.deviceaswebcam.flags-all",
   package: "com.android.deviceaswebcam.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp
index 99794f0b..2f92811c 100644
--- a/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp
+++ b/aconfig/ap2a/com.android.graphics.surfaceflinger.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.graphics.surfaceflinger.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.graphics.surfaceflinger.flags-all",
   package: "com.android.graphics.surfaceflinger.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.hardware.input/Android.bp b/aconfig/ap2a/com.android.hardware.input/Android.bp
index d371d858..60eecefa 100644
--- a/aconfig/ap2a/com.android.hardware.input/Android.bp
+++ b/aconfig/ap2a/com.android.hardware.input/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.hardware.input-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.hardware.input-all",
   package: "com.android.hardware.input",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.input.flags/Android.bp b/aconfig/ap2a/com.android.input.flags/Android.bp
index a54e650a..c6df454e 100644
--- a/aconfig/ap2a/com.android.input.flags/Android.bp
+++ b/aconfig/ap2a/com.android.input.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.input.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.input.flags-all",
   package: "com.android.input.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.intentresolver/Android.bp b/aconfig/ap2a/com.android.intentresolver/Android.bp
index 21975e27..4eee0e47 100644
--- a/aconfig/ap2a/com.android.intentresolver/Android.bp
+++ b/aconfig/ap2a/com.android.intentresolver/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.intentresolver-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.intentresolver-all",
   package: "com.android.intentresolver",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.internal.camera.flags/Android.bp b/aconfig/ap2a/com.android.internal.camera.flags/Android.bp
index 930e62a5..6c1e35d3 100644
--- a/aconfig/ap2a/com.android.internal.camera.flags/Android.bp
+++ b/aconfig/ap2a/com.android.internal.camera.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.internal.camera.flags-all",
+  name: "aconfig-values-platform_build_release-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.telephony.flags/Android.bp b/aconfig/ap2a/com.android.internal.telephony.flags/Android.bp
index 4481a594..e97ca2a9 100644
--- a/aconfig/ap2a/com.android.internal.telephony.flags/Android.bp
+++ b/aconfig/ap2a/com.android.internal.telephony.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.internal.telephony.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.internal.telephony.flags-all",
   package: "com.android.internal.telephony.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.launcher3/Android.bp b/aconfig/ap2a/com.android.launcher3/Android.bp
index dd58b33e..6630a1fb 100644
--- a/aconfig/ap2a/com.android.launcher3/Android.bp
+++ b/aconfig/ap2a/com.android.launcher3/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.launcher3-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.launcher3-all",
   package: "com.android.launcher3",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.media.audio/Android.bp b/aconfig/ap2a/com.android.media.audio/Android.bp
index 9cb19a65..1cb841c4 100644
--- a/aconfig/ap2a/com.android.media.audio/Android.bp
+++ b/aconfig/ap2a/com.android.media.audio/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.media.audio-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.media.audio-all",
   package: "com.android.media.audio",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.media.flags/Android.bp b/aconfig/ap2a/com.android.media.flags/Android.bp
index 6cfc3bc2..fabac7a4 100644
--- a/aconfig/ap2a/com.android.media.flags/Android.bp
+++ b/aconfig/ap2a/com.android.media.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.media.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.media.flags-all",
   package: "com.android.media.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.media.playback.flags/Android.bp b/aconfig/ap2a/com.android.media.playback.flags/Android.bp
index a36aa116..9c680071 100644
--- a/aconfig/ap2a/com.android.media.playback.flags/Android.bp
+++ b/aconfig/ap2a/com.android.media.playback.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.media.playback.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.media.playback.flags-all",
   package: "com.android.media.playback.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.permission.flags/Android.bp b/aconfig/ap2a/com.android.permission.flags/Android.bp
index 1253a680..88892dc7 100644
--- a/aconfig/ap2a/com.android.permission.flags/Android.bp
+++ b/aconfig/ap2a/com.android.permission.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.permission.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.permission.flags-all",
   package: "com.android.permission.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.sdksandbox.flags/Android.bp b/aconfig/ap2a/com.android.sdksandbox.flags/Android.bp
index 6bd2f1cd..17c0c0b1 100644
--- a/aconfig/ap2a/com.android.sdksandbox.flags/Android.bp
+++ b/aconfig/ap2a/com.android.sdksandbox.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.sdksandbox.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.sdksandbox.flags-all",
   package: "com.android.sdksandbox.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.accessibility/Android.bp b/aconfig/ap2a/com.android.server.accessibility/Android.bp
index 6f90a34c..6d53ee13 100644
--- a/aconfig/ap2a/com.android.server.accessibility/Android.bp
+++ b/aconfig/ap2a/com.android.server.accessibility/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.accessibility-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.accessibility-all",
   package: "com.android.server.accessibility",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.backup/Android.bp b/aconfig/ap2a/com.android.server.backup/Android.bp
index f12e7540..7f8dd72a 100644
--- a/aconfig/ap2a/com.android.server.backup/Android.bp
+++ b/aconfig/ap2a/com.android.server.backup/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.backup-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.backup-all",
   package: "com.android.server.backup",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.companion.virtual/Android.bp b/aconfig/ap2a/com.android.server.companion.virtual/Android.bp
index 08b009fe..0e2f2e9c 100644
--- a/aconfig/ap2a/com.android.server.companion.virtual/Android.bp
+++ b/aconfig/ap2a/com.android.server.companion.virtual/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.companion.virtual-all",
+  name: "aconfig-values-platform_build_release-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.display.feature.flags/Android.bp b/aconfig/ap2a/com.android.server.display.feature.flags/Android.bp
index 08c79325..b5a401f5 100644
--- a/aconfig/ap2a/com.android.server.display.feature.flags/Android.bp
+++ b/aconfig/ap2a/com.android.server.display.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.display.feature.flags-all",
+  name: "aconfig-values-platform_build_release-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.flags/Android.bp b/aconfig/ap2a/com.android.server.flags/Android.bp
index bd33f07a..728d0be2 100644
--- a/aconfig/ap2a/com.android.server.flags/Android.bp
+++ b/aconfig/ap2a/com.android.server.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.flags-all",
   package: "com.android.server.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.job/Android.bp b/aconfig/ap2a/com.android.server.job/Android.bp
index 5441c51b..89915a7a 100644
--- a/aconfig/ap2a/com.android.server.job/Android.bp
+++ b/aconfig/ap2a/com.android.server.job/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.job-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.job-all",
   package: "com.android.server.job",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.notification/Android.bp b/aconfig/ap2a/com.android.server.notification/Android.bp
index 937e3bd7..872050a8 100644
--- a/aconfig/ap2a/com.android.server.notification/Android.bp
+++ b/aconfig/ap2a/com.android.server.notification/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.notification-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.notification-all",
   package: "com.android.server.notification",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.policy.feature.flags/Android.bp b/aconfig/ap2a/com.android.server.policy.feature.flags/Android.bp
index f0b2a316..855a2087 100644
--- a/aconfig/ap2a/com.android.server.policy.feature.flags/Android.bp
+++ b/aconfig/ap2a/com.android.server.policy.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.policy.feature.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.policy.feature.flags-all",
   package: "com.android.server.policy.feature.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.server.telecom.flags/Android.bp b/aconfig/ap2a/com.android.server.telecom.flags/Android.bp
index f96a4cf6..64b14d53 100644
--- a/aconfig/ap2a/com.android.server.telecom.flags/Android.bp
+++ b/aconfig/ap2a/com.android.server.telecom.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.server.telecom.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.server.telecom.flags-all",
   package: "com.android.server.telecom.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.settings.flags/Android.bp b/aconfig/ap2a/com.android.settings.flags/Android.bp
index 93ee9397..c2764c67 100644
--- a/aconfig/ap2a/com.android.settings.flags/Android.bp
+++ b/aconfig/ap2a/com.android.settings.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.settings.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.settings.flags-all",
   package: "com.android.settings.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.settingslib.flags/Android.bp b/aconfig/ap2a/com.android.settingslib.flags/Android.bp
index ce60f4a0..15e77aff 100644
--- a/aconfig/ap2a/com.android.settingslib.flags/Android.bp
+++ b/aconfig/ap2a/com.android.settingslib.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.settingslib.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.settingslib.flags-all",
   package: "com.android.settingslib.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.systemui/Android.bp b/aconfig/ap2a/com.android.systemui/Android.bp
index 95a3cdcd..2aa820c1 100644
--- a/aconfig/ap2a/com.android.systemui/Android.bp
+++ b/aconfig/ap2a/com.android.systemui/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.systemui-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.systemui-all",
   package: "com.android.systemui",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.text.flags/Android.bp b/aconfig/ap2a/com.android.text.flags/Android.bp
index b68a4833..b09540fc 100644
--- a/aconfig/ap2a/com.android.text.flags/Android.bp
+++ b/aconfig/ap2a/com.android.text.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.text.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.text.flags-all",
   package: "com.android.text.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.uwb.flags/Android.bp b/aconfig/ap2a/com.android.uwb.flags/Android.bp
index 7b05b042..ae77f00c 100644
--- a/aconfig/ap2a/com.android.uwb.flags/Android.bp
+++ b/aconfig/ap2a/com.android.uwb.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.uwb.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.uwb.flags-all",
   package: "com.android.uwb.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.window.flags/Android.bp b/aconfig/ap2a/com.android.window.flags/Android.bp
index 739bbf43..561af199 100644
--- a/aconfig/ap2a/com.android.window.flags/Android.bp
+++ b/aconfig/ap2a/com.android.window.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.window.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.window.flags-all",
   package: "com.android.window.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.android.wm.shell/Android.bp b/aconfig/ap2a/com.android.wm.shell/Android.bp
index b57ad227..d67d0b5f 100644
--- a/aconfig/ap2a/com.android.wm.shell/Android.bp
+++ b/aconfig/ap2a/com.android.wm.shell/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.android.wm.shell-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.android.wm.shell-all",
   package: "com.android.wm.shell",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp b/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp
index f4df8251..af726dc4 100644
--- a/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp
+++ b/aconfig/ap2a/com.google.android.iwlan.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-ap2a-com.google.android.iwlan.flags-all",
+  name: "aconfig-values-platform_build_release-ap2a-com.google.android.iwlan.flags-all",
   package: "com.google.android.iwlan.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/Android.bp b/aconfig/trunk_staging/Android.bp
index e06fda6d..031e60b1 100644
--- a/aconfig/trunk_staging/Android.bp
+++ b/aconfig/trunk_staging/Android.bp
@@ -13,140 +13,140 @@
 // limitations under the License.
 
 aconfig_value_set {
-    name: "aconfig_value_set-aosp-trunk_staging",
+    name: "aconfig_value_set-platform_build_release-trunk_staging",
     values: [
-      "aconfig-values-aosp-trunk_staging-com.android.providers.settings-all",
-      "aconfig-values-aosp-trunk_staging-com.android.system.virtualmachine.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.app.ondeviceintelligence.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.hardware.radio-all",
-      "aconfig-values-aosp-trunk_staging-android.view.inputmethod-all",
-      "aconfig-values-aosp-trunk_staging-android.net.wifi.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.speech.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.appsearch.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settings.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.stats-all",
-      "aconfig-values-aosp-trunk_staging-com.android.wallpaper-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.aaudio-all",
-      "aconfig-values-aosp-trunk_staging-android.hardware.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.car.carlauncher-all",
-      "aconfig-values-aosp-trunk_staging-android.os-all",
-      "aconfig-values-aosp-trunk_staging-com.android.uwb.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.deviceidle-all",
-      "aconfig-values-aosp-trunk_staging-android.service.notification-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.net-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.deviceconfig-all",
-      "aconfig-values-aosp-trunk_staging-com.example.android.aconfig.demo.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.utils-all",
-      "aconfig-values-aosp-trunk_staging-android.companion.virtual.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.wm.shell-all",
-      "aconfig-values-aosp-trunk_staging-com.android.icu-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.editing.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.service.voice.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.server-all",
-      "aconfig-values-aosp-trunk_staging-android.app.admin.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.internal.telephony.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.policy-all",
-      "aconfig-values-aosp-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
-      "aconfig-values-aosp-trunk_staging-com.android.wifi.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.server.app-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.audioserver-all",
-      "aconfig-values-aosp-trunk_staging-android.security.keystore2-all",
-      "aconfig-values-aosp-trunk_staging-com.android.bluetooth.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.ipsec.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.graphics.hwui.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.provider-all",
-      "aconfig-values-aosp-trunk_staging-com.android.nfc.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.security.flag-all",
-      "aconfig-values-aosp-trunk_staging-android.service.chooser-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.audio-all",
-      "aconfig-values-aosp-trunk_staging-android.net.vcn-all",
-      "aconfig-values-aosp-trunk_staging-com.android.intentresolver-all",
-      "aconfig-values-aosp-trunk_staging-com.android.launcher3-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.alarm-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.companion.virtual-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.job-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.power.optimization-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.telecom.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settings.media_drm-all",
-      "aconfig-values-aosp-trunk_staging-android.app.smartspace.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.systemui.shared-all",
-      "aconfig-values-aosp-trunk_staging-android.content.res-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.policy.feature.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.service.autofill-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.notification-all",
-      "aconfig-values-aosp-trunk_staging-android.os.profiling-all",
-      "aconfig-values-aosp-trunk_staging-android.companion.virtualdevice.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.trunk_stable_workflow_testing-all",
-      "aconfig-values-aosp-trunk_staging-android.database.sqlite-all",
-      "aconfig-values-aosp-trunk_staging-android.content.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.accessibility-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.view.accessibility-all",
-      "aconfig-values-aosp-trunk_staging-android.hardware.biometrics-all",
-      "aconfig-values-aosp-trunk_staging-android.chre.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settingslib.media.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.text.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.projection.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.app-all",
-      "aconfig-values-aosp-trunk_staging-android.adaptiveauth-all",
-      "aconfig-values-aosp-trunk_staging-android.app.usage-all",
-      "aconfig-values-aosp-trunk_staging-com.android.hardware.libsensor.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.media.audiopolicy-all",
-      "aconfig-values-aosp-trunk_staging-android.media.midi-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settings.factory_reset-all",
-      "aconfig-values-aosp-trunk_staging-com.android.libcore-all",
-      "aconfig-values-aosp-trunk_staging-com.android.input.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settings.development-all",
-      "aconfig-values-aosp-trunk_staging-android.media.audio-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.am-all",
-      "aconfig-values-aosp-trunk_staging-android.location.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.usb.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.google.android.iwlan.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.os.vibrator-all",
-      "aconfig-values-aosp-trunk_staging-com.android.window.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.security-all",
-      "aconfig-values-aosp-trunk_staging-android.view.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.widget.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.systemui-all",
-      "aconfig-values-aosp-trunk_staging-com.android.aconfig.test-all",
-      "aconfig-values-aosp-trunk_staging-android.appwidget.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.internal.foldables.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settingslib.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.companion-all",
-      "aconfig-values-aosp-trunk_staging-com.android.hardware.input-all",
-      "aconfig-values-aosp-trunk_staging-android.app.job-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.feature.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.view.contentcapture.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.credentials.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.backup-all",
-      "aconfig-values-aosp-trunk_staging-com.android.deviceaswebcam.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.multiuser-all",
-      "aconfig-values-aosp-trunk_staging-com.android.systemui.car-all",
-      "aconfig-values-aosp-trunk_staging-com.android.nfc.nci.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.display.feature.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.permission.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.service.controls.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.internal.camera.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.frameworks.sensorservice.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.app.wearable-all",
-      "aconfig-values-aosp-trunk_staging-android.view.contentprotection.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.power.feature.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.media.codec-all",
-      "aconfig-values-aosp-trunk_staging-android.hardware.usb.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.graphics.libgui.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.biometrics-all",
-      "aconfig-values-aosp-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.server.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.permission.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.content.pm-all",
-      "aconfig-values-aosp-trunk_staging-android.car.feature-all",
-      "aconfig-values-aosp-trunk_staging-com.android.sdksandbox.flags-all",
-      "aconfig-values-aosp-trunk_staging-android.nfc-all",
-      "aconfig-values-aosp-trunk_staging-com.android.settings.accessibility-all",
-      "aconfig-values-aosp-trunk_staging-android.tracing-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.playback.flags-all",
-      "aconfig-values-aosp-trunk_staging-com.android.media.codec.flags-all"
+      "aconfig-values-platform_build_release-trunk_staging-com.android.providers.settings-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.system.virtualmachine.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.ondeviceintelligence.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.radio-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.inputmethod-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.net.wifi.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.speech.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.appsearch.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.stats-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wallpaper-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.aaudio-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.car.carlauncher-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.os-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.uwb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceidle-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.notification-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.net-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceconfig-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.example.android.aconfig.demo.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.utils-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtual.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wm.shell-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.icu-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.editing.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.voice.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.server-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.admin.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.telephony.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.wifi.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.server.app-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioserver-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.security.keystore2-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.bluetooth.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.ipsec.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.hwui.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.provider-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.security.flag-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.chooser-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.audio-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.net.vcn-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.intentresolver-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.launcher3-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.alarm-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.companion.virtual-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.job-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.optimization-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.telecom.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.media_drm-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.smartspace.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.shared-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.res-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.autofill-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.notification-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.os.profiling-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion.virtualdevice.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.trunk_stable_workflow_testing-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.database.sqlite-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.biometrics-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.chre.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.media.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.text.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.projection.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.adaptiveauth-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.usage-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.libsensor.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.audiopolicy-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.midi-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.factory_reset-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.libcore-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.input.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.development-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.audio-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.am-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.location.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.usb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.google.android.iwlan.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.os.vibrator-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.window.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.security-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.widget.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.systemui-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.test-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.appwidget.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.foldables.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.companion-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.input-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.job-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.contentcapture.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.credentials.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.backup-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.systemui.car-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.nci.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.display.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.permission.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.service.controls.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.internal.camera.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.frameworks.sensorservice.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.app.wearable-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.view.contentprotection.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.feature.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.media.codec-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.hardware.usb.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libgui.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.biometrics-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.server.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.permission.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.content.pm-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.car.feature-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.sdksandbox.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.nfc-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.settings.accessibility-all",
+      "aconfig-values-platform_build_release-trunk_staging-android.tracing-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.playback.flags-all",
+      "aconfig-values-platform_build_release-trunk_staging-com.android.media.codec.flags-all"
     ]
 }
diff --git a/aconfig/trunk_staging/android.adaptiveauth/Android.bp b/aconfig/trunk_staging/android.adaptiveauth/Android.bp
index 7b2d4902..6abbb1f7 100644
--- a/aconfig/trunk_staging/android.adaptiveauth/Android.bp
+++ b/aconfig/trunk_staging/android.adaptiveauth/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.adaptiveauth-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.adaptiveauth-all",
   package: "android.adaptiveauth",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.admin.flags/Android.bp b/aconfig/trunk_staging/android.app.admin.flags/Android.bp
index a0f9a333..2feafbc1 100644
--- a/aconfig/trunk_staging/android.app.admin.flags/Android.bp
+++ b/aconfig/trunk_staging/android.app.admin.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.admin.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.admin.flags-all",
   package: "android.app.admin.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.job/Android.bp b/aconfig/trunk_staging/android.app.job/Android.bp
index 621a49ba..ef85b01b 100644
--- a/aconfig/trunk_staging/android.app.job/Android.bp
+++ b/aconfig/trunk_staging/android.app.job/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.job-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.job-all",
   package: "android.app.job",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp b/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp
index d71a3706..ca43701a 100644
--- a/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp
+++ b/aconfig/trunk_staging/android.app.ondeviceintelligence.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.ondeviceintelligence.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.ondeviceintelligence.flags-all",
   package: "android.app.ondeviceintelligence.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp b/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp
index 76469e3a..b24f6940 100644
--- a/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp
+++ b/aconfig/trunk_staging/android.app.smartspace.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.smartspace.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.smartspace.flags-all",
   package: "android.app.smartspace.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.usage/Android.bp b/aconfig/trunk_staging/android.app.usage/Android.bp
index 96feee35..519c3b64 100644
--- a/aconfig/trunk_staging/android.app.usage/Android.bp
+++ b/aconfig/trunk_staging/android.app.usage/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.usage-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.usage-all",
   package: "android.app.usage",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app.wearable/Android.bp b/aconfig/trunk_staging/android.app.wearable/Android.bp
index 9e9981be..030d0ff2 100644
--- a/aconfig/trunk_staging/android.app.wearable/Android.bp
+++ b/aconfig/trunk_staging/android.app.wearable/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app.wearable-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app.wearable-all",
   package: "android.app.wearable",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.app/Android.bp b/aconfig/trunk_staging/android.app/Android.bp
index 86f0b976..c23f24c5 100644
--- a/aconfig/trunk_staging/android.app/Android.bp
+++ b/aconfig/trunk_staging/android.app/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.app-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.app-all",
   package: "android.app",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.appwidget.flags/Android.bp b/aconfig/trunk_staging/android.appwidget.flags/Android.bp
index f28c100a..7fb3ad52 100644
--- a/aconfig/trunk_staging/android.appwidget.flags/Android.bp
+++ b/aconfig/trunk_staging/android.appwidget.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.appwidget.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.appwidget.flags-all",
   package: "android.appwidget.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.car.feature/Android.bp b/aconfig/trunk_staging/android.car.feature/Android.bp
index 431cbbff..c295d627 100644
--- a/aconfig/trunk_staging/android.car.feature/Android.bp
+++ b/aconfig/trunk_staging/android.car.feature/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.car.feature-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.car.feature-all",
   package: "android.car.feature",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.chre.flags/Android.bp b/aconfig/trunk_staging/android.chre.flags/Android.bp
index c0c337ed..9b10bcf2 100644
--- a/aconfig/trunk_staging/android.chre.flags/Android.bp
+++ b/aconfig/trunk_staging/android.chre.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.chre.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.chre.flags-all",
   package: "android.chre.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp b/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp
index 663e5d39..6aa16d2a 100644
--- a/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp
+++ b/aconfig/trunk_staging/android.companion.virtual.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.companion.virtual.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.companion.virtual.flags-all",
   package: "android.companion.virtual.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp b/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp
index d1f14f43..77b9eb72 100644
--- a/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp
+++ b/aconfig/trunk_staging/android.companion.virtualdevice.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.companion.virtualdevice.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.companion.virtualdevice.flags-all",
   package: "android.companion.virtualdevice.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.companion/Android.bp b/aconfig/trunk_staging/android.companion/Android.bp
index 5278b841..a659fa8e 100644
--- a/aconfig/trunk_staging/android.companion/Android.bp
+++ b/aconfig/trunk_staging/android.companion/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.companion-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.companion-all",
   package: "android.companion",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.content.flags/Android.bp b/aconfig/trunk_staging/android.content.flags/Android.bp
index fda0b048..b7eec337 100644
--- a/aconfig/trunk_staging/android.content.flags/Android.bp
+++ b/aconfig/trunk_staging/android.content.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.content.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.content.flags-all",
   package: "android.content.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.content.pm/Android.bp b/aconfig/trunk_staging/android.content.pm/Android.bp
index 26f30893..26bf618e 100644
--- a/aconfig/trunk_staging/android.content.pm/Android.bp
+++ b/aconfig/trunk_staging/android.content.pm/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.content.pm-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.content.pm-all",
   package: "android.content.pm",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.content.res/Android.bp b/aconfig/trunk_staging/android.content.res/Android.bp
index 4a9f3a21..f56751e5 100644
--- a/aconfig/trunk_staging/android.content.res/Android.bp
+++ b/aconfig/trunk_staging/android.content.res/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.content.res-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.content.res-all",
   package: "android.content.res",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.credentials.flags/Android.bp b/aconfig/trunk_staging/android.credentials.flags/Android.bp
index 6525a8d6..c1169526 100644
--- a/aconfig/trunk_staging/android.credentials.flags/Android.bp
+++ b/aconfig/trunk_staging/android.credentials.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.credentials.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.credentials.flags-all",
   package: "android.credentials.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.database.sqlite/Android.bp b/aconfig/trunk_staging/android.database.sqlite/Android.bp
index 48a6dad8..e5bd4a09 100644
--- a/aconfig/trunk_staging/android.database.sqlite/Android.bp
+++ b/aconfig/trunk_staging/android.database.sqlite/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.database.sqlite-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.database.sqlite-all",
   package: "android.database.sqlite",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.hardware.biometrics/Android.bp b/aconfig/trunk_staging/android.hardware.biometrics/Android.bp
index a1d3ef34..940740aa 100644
--- a/aconfig/trunk_staging/android.hardware.biometrics/Android.bp
+++ b/aconfig/trunk_staging/android.hardware.biometrics/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.hardware.biometrics-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.biometrics-all",
   package: "android.hardware.biometrics",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.hardware.flags/Android.bp b/aconfig/trunk_staging/android.hardware.flags/Android.bp
index 839015a4..e00a9b58 100644
--- a/aconfig/trunk_staging/android.hardware.flags/Android.bp
+++ b/aconfig/trunk_staging/android.hardware.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.hardware.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.flags-all",
   package: "android.hardware.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.hardware.radio/Android.bp b/aconfig/trunk_staging/android.hardware.radio/Android.bp
index 9bb04640..05c1c128 100644
--- a/aconfig/trunk_staging/android.hardware.radio/Android.bp
+++ b/aconfig/trunk_staging/android.hardware.radio/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.hardware.radio-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.radio-all",
   package: "android.hardware.radio",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp b/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp
index 307408ab..c0f55740 100644
--- a/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp
+++ b/aconfig/trunk_staging/android.hardware.usb.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.hardware.usb.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.hardware.usb.flags-all",
   package: "android.hardware.usb.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.location.flags/Android.bp b/aconfig/trunk_staging/android.location.flags/Android.bp
index 300f883d..90225b90 100644
--- a/aconfig/trunk_staging/android.location.flags/Android.bp
+++ b/aconfig/trunk_staging/android.location.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.location.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.location.flags-all",
   package: "android.location.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.media.audio/Android.bp b/aconfig/trunk_staging/android.media.audio/Android.bp
index 42910fce..1648ccd6 100644
--- a/aconfig/trunk_staging/android.media.audio/Android.bp
+++ b/aconfig/trunk_staging/android.media.audio/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.media.audio-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.media.audio-all",
   package: "android.media.audio",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.media.audiopolicy/Android.bp b/aconfig/trunk_staging/android.media.audiopolicy/Android.bp
index 0611072f..520847a4 100644
--- a/aconfig/trunk_staging/android.media.audiopolicy/Android.bp
+++ b/aconfig/trunk_staging/android.media.audiopolicy/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.media.audiopolicy-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.media.audiopolicy-all",
   package: "android.media.audiopolicy",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.media.codec/Android.bp b/aconfig/trunk_staging/android.media.codec/Android.bp
index 7de1a430..bda1ef68 100644
--- a/aconfig/trunk_staging/android.media.codec/Android.bp
+++ b/aconfig/trunk_staging/android.media.codec/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.media.codec-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.media.codec-all",
   package: "android.media.codec",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.media.midi/Android.bp b/aconfig/trunk_staging/android.media.midi/Android.bp
index e19d10ec..7107087c 100644
--- a/aconfig/trunk_staging/android.media.midi/Android.bp
+++ b/aconfig/trunk_staging/android.media.midi/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.media.midi-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.media.midi-all",
   package: "android.media.midi",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.multiuser/Android.bp b/aconfig/trunk_staging/android.multiuser/Android.bp
index e892f24b..752eedf5 100644
--- a/aconfig/trunk_staging/android.multiuser/Android.bp
+++ b/aconfig/trunk_staging/android.multiuser/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.multiuser-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.multiuser-all",
   package: "android.multiuser",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.net.vcn/Android.bp b/aconfig/trunk_staging/android.net.vcn/Android.bp
index ccaf896f..ec8b6f65 100644
--- a/aconfig/trunk_staging/android.net.vcn/Android.bp
+++ b/aconfig/trunk_staging/android.net.vcn/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.net.vcn-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.net.vcn-all",
   package: "android.net.vcn",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.net.wifi.flags/Android.bp b/aconfig/trunk_staging/android.net.wifi.flags/Android.bp
index 890088c6..943b6690 100644
--- a/aconfig/trunk_staging/android.net.wifi.flags/Android.bp
+++ b/aconfig/trunk_staging/android.net.wifi.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.net.wifi.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.net.wifi.flags-all",
   package: "android.net.wifi.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.nfc/Android.bp b/aconfig/trunk_staging/android.nfc/Android.bp
index d9f63eac..ea05f150 100644
--- a/aconfig/trunk_staging/android.nfc/Android.bp
+++ b/aconfig/trunk_staging/android.nfc/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.nfc-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.nfc-all",
   package: "android.nfc",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.os.profiling/Android.bp b/aconfig/trunk_staging/android.os.profiling/Android.bp
index 4bccd4c0..067c45c8 100644
--- a/aconfig/trunk_staging/android.os.profiling/Android.bp
+++ b/aconfig/trunk_staging/android.os.profiling/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.os.profiling-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.os.profiling-all",
   package: "android.os.profiling",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.os.vibrator/Android.bp b/aconfig/trunk_staging/android.os.vibrator/Android.bp
index f6ab8236..90ded959 100644
--- a/aconfig/trunk_staging/android.os.vibrator/Android.bp
+++ b/aconfig/trunk_staging/android.os.vibrator/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.os.vibrator-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.os.vibrator-all",
   package: "android.os.vibrator",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.os/Android.bp b/aconfig/trunk_staging/android.os/Android.bp
index ff58ca2d..a13e06ae 100644
--- a/aconfig/trunk_staging/android.os/Android.bp
+++ b/aconfig/trunk_staging/android.os/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.os-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.os-all",
   package: "android.os",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.permission.flags/Android.bp b/aconfig/trunk_staging/android.permission.flags/Android.bp
index d55b74ed..91b57acc 100644
--- a/aconfig/trunk_staging/android.permission.flags/Android.bp
+++ b/aconfig/trunk_staging/android.permission.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.permission.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.permission.flags-all",
   package: "android.permission.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.provider/Android.bp b/aconfig/trunk_staging/android.provider/Android.bp
index 604c705d..74f7c915 100644
--- a/aconfig/trunk_staging/android.provider/Android.bp
+++ b/aconfig/trunk_staging/android.provider/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.provider-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.provider-all",
   package: "android.provider",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.security.flag/Android.bp b/aconfig/trunk_staging/android.security.flag/Android.bp
index 56d6e4c8..f23d6150 100644
--- a/aconfig/trunk_staging/android.security.flag/Android.bp
+++ b/aconfig/trunk_staging/android.security.flag/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.security.flag-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.security.flag-all",
   package: "android.security.flag",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.security.keystore2/Android.bp b/aconfig/trunk_staging/android.security.keystore2/Android.bp
index 17218349..79d3ff98 100644
--- a/aconfig/trunk_staging/android.security.keystore2/Android.bp
+++ b/aconfig/trunk_staging/android.security.keystore2/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.security.keystore2-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.security.keystore2-all",
   package: "android.security.keystore2",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.security/Android.bp b/aconfig/trunk_staging/android.security/Android.bp
index 0b6edd72..5183207a 100644
--- a/aconfig/trunk_staging/android.security/Android.bp
+++ b/aconfig/trunk_staging/android.security/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.security-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.security-all",
   package: "android.security",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.server.app/Android.bp b/aconfig/trunk_staging/android.server.app/Android.bp
index 74517bde..67a2b416 100644
--- a/aconfig/trunk_staging/android.server.app/Android.bp
+++ b/aconfig/trunk_staging/android.server.app/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.server.app-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.server.app-all",
   package: "android.server.app",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.server/Android.bp b/aconfig/trunk_staging/android.server/Android.bp
index 4ac0620c..103b1383 100644
--- a/aconfig/trunk_staging/android.server/Android.bp
+++ b/aconfig/trunk_staging/android.server/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.server-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.server-all",
   package: "android.server",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.service.autofill/Android.bp b/aconfig/trunk_staging/android.service.autofill/Android.bp
index 115ec589..2c8b987f 100644
--- a/aconfig/trunk_staging/android.service.autofill/Android.bp
+++ b/aconfig/trunk_staging/android.service.autofill/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.service.autofill-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.service.autofill-all",
   package: "android.service.autofill",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.service.chooser/Android.bp b/aconfig/trunk_staging/android.service.chooser/Android.bp
index 21853340..8879a6cd 100644
--- a/aconfig/trunk_staging/android.service.chooser/Android.bp
+++ b/aconfig/trunk_staging/android.service.chooser/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.service.chooser-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.service.chooser-all",
   package: "android.service.chooser",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.service.controls.flags/Android.bp b/aconfig/trunk_staging/android.service.controls.flags/Android.bp
index f59bc630..6397e2df 100644
--- a/aconfig/trunk_staging/android.service.controls.flags/Android.bp
+++ b/aconfig/trunk_staging/android.service.controls.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.service.controls.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.service.controls.flags-all",
   package: "android.service.controls.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.service.notification/Android.bp b/aconfig/trunk_staging/android.service.notification/Android.bp
index 04bac6df..976be7f9 100644
--- a/aconfig/trunk_staging/android.service.notification/Android.bp
+++ b/aconfig/trunk_staging/android.service.notification/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.service.notification-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.service.notification-all",
   package: "android.service.notification",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.service.voice.flags/Android.bp b/aconfig/trunk_staging/android.service.voice.flags/Android.bp
index 285dc702..6303bd36 100644
--- a/aconfig/trunk_staging/android.service.voice.flags/Android.bp
+++ b/aconfig/trunk_staging/android.service.voice.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.service.voice.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.service.voice.flags-all",
   package: "android.service.voice.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.speech.flags/Android.bp b/aconfig/trunk_staging/android.speech.flags/Android.bp
index ca42542f..b9eae383 100644
--- a/aconfig/trunk_staging/android.speech.flags/Android.bp
+++ b/aconfig/trunk_staging/android.speech.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.speech.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.speech.flags-all",
   package: "android.speech.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.tracing/Android.bp b/aconfig/trunk_staging/android.tracing/Android.bp
index 769d2061..22567a83 100644
--- a/aconfig/trunk_staging/android.tracing/Android.bp
+++ b/aconfig/trunk_staging/android.tracing/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.tracing-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.tracing-all",
   package: "android.tracing",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.view.accessibility/Android.bp b/aconfig/trunk_staging/android.view.accessibility/Android.bp
index 193056aa..83ec62d6 100644
--- a/aconfig/trunk_staging/android.view.accessibility/Android.bp
+++ b/aconfig/trunk_staging/android.view.accessibility/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.view.accessibility-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.view.accessibility-all",
   package: "android.view.accessibility",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp b/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp
index 8941f130..1cdd2b80 100644
--- a/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp
+++ b/aconfig/trunk_staging/android.view.contentcapture.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.view.contentcapture.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.view.contentcapture.flags-all",
   package: "android.view.contentcapture.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp b/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp
index 3cb40df9..db2a7ca1 100644
--- a/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp
+++ b/aconfig/trunk_staging/android.view.contentprotection.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.view.contentprotection.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.view.contentprotection.flags-all",
   package: "android.view.contentprotection.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.view.flags/Android.bp b/aconfig/trunk_staging/android.view.flags/Android.bp
index 84e0cc88..8b5ccd2b 100644
--- a/aconfig/trunk_staging/android.view.flags/Android.bp
+++ b/aconfig/trunk_staging/android.view.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.view.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.view.flags-all",
   package: "android.view.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.view.inputmethod/Android.bp b/aconfig/trunk_staging/android.view.inputmethod/Android.bp
index 5cff628a..04db6114 100644
--- a/aconfig/trunk_staging/android.view.inputmethod/Android.bp
+++ b/aconfig/trunk_staging/android.view.inputmethod/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.view.inputmethod-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.view.inputmethod-all",
   package: "android.view.inputmethod",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/android.widget.flags/Android.bp b/aconfig/trunk_staging/android.widget.flags/Android.bp
index ff325fe1..5dbc7103 100644
--- a/aconfig/trunk_staging/android.widget.flags/Android.bp
+++ b/aconfig/trunk_staging/android.widget.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-android.widget.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-android.widget.flags-all",
   package: "android.widget.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.aconfig.test/Android.bp b/aconfig/trunk_staging/com.android.aconfig.test/Android.bp
index b7f73225..cfb5cd6e 100644
--- a/aconfig/trunk_staging/com.android.aconfig.test/Android.bp
+++ b/aconfig/trunk_staging/com.android.aconfig.test/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.aconfig.test-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.aconfig.test-all",
   package: "com.android.aconfig.test",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp b/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp
index 00b40ba5..791fd5d5 100644
--- a/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.appsearch.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.appsearch.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.appsearch.flags-all",
   package: "com.android.appsearch.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp b/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp
index 3a65ff3b..8a8e71a7 100644
--- a/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.bluetooth.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.bluetooth.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.bluetooth.flags-all",
   package: "com.android.bluetooth.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp b/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
index be7c946c..9e7ad32c 100644
--- a/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
+++ b/aconfig/trunk_staging/com.android.car.carlauncher/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.car.carlauncher-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.car.carlauncher-all",
   package: "com.android.car.carlauncher",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp b/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp
index 0a7a0b46..dffcc1b4 100644
--- a/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.deviceaswebcam.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.deviceaswebcam.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.deviceaswebcam.flags-all",
   package: "com.android.deviceaswebcam.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp b/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp
index c302d8b6..a8f41395 100644
--- a/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.frameworks.sensorservice.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.frameworks.sensorservice.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.frameworks.sensorservice.flags-all",
   package: "com.android.frameworks.sensorservice.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp
index f09800da..caa20b51 100644
--- a/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.graphics.hwui.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.graphics.hwui.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.hwui.flags-all",
   package: "com.android.graphics.hwui.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp
index 5becdf8e..bc258745 100644
--- a/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.graphics.libgui.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.graphics.libgui.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.libgui.flags-all",
   package: "com.android.graphics.libgui.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp
index d3b9883c..99c897f9 100644
--- a/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.graphics.surfaceflinger.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.graphics.surfaceflinger.flags-all",
   package: "com.android.graphics.surfaceflinger.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.hardware.input/Android.bp b/aconfig/trunk_staging/com.android.hardware.input/Android.bp
index 50c91350..9bf5ff67 100644
--- a/aconfig/trunk_staging/com.android.hardware.input/Android.bp
+++ b/aconfig/trunk_staging/com.android.hardware.input/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.hardware.input-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.input-all",
   package: "com.android.hardware.input",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp
index 615a947f..1b1599eb 100644
--- a/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.hardware.libsensor.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.hardware.libsensor.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.hardware.libsensor.flags-all",
   package: "com.android.hardware.libsensor.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.icu/Android.bp b/aconfig/trunk_staging/com.android.icu/Android.bp
index 88c7b6e6..3d04882b 100644
--- a/aconfig/trunk_staging/com.android.icu/Android.bp
+++ b/aconfig/trunk_staging/com.android.icu/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.icu-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.icu-all",
   package: "com.android.icu",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.input.flags/Android.bp b/aconfig/trunk_staging/com.android.input.flags/Android.bp
index f13ae7a8..5967717c 100644
--- a/aconfig/trunk_staging/com.android.input.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.input.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.input.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.input.flags-all",
   package: "com.android.input.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.intentresolver/Android.bp b/aconfig/trunk_staging/com.android.intentresolver/Android.bp
index 6d0e7b26..941c1a90 100644
--- a/aconfig/trunk_staging/com.android.intentresolver/Android.bp
+++ b/aconfig/trunk_staging/com.android.intentresolver/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.intentresolver-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.intentresolver-all",
   package: "com.android.intentresolver",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp
index 7a543d7a..419f4442 100644
--- a/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.internal.camera.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.internal.camera.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.camera.flags-all",
   package: "com.android.internal.camera.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp
index abc6a48d..a39e4405 100644
--- a/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.internal.foldables.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.internal.foldables.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.foldables.flags-all",
   package: "com.android.internal.foldables.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp
index ea9e56a6..7e5d1c30 100644
--- a/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.internal.pm.pkg.component.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.pm.pkg.component.flags-all",
   package: "com.android.internal.pm.pkg.component.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp b/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp
index 12b72f21..af8a1c7c 100644
--- a/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.internal.telephony.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.internal.telephony.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.internal.telephony.flags-all",
   package: "com.android.internal.telephony.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp b/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp
index 3aa3c284..217dd3a8 100644
--- a/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.ipsec.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.ipsec.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.ipsec.flags-all",
   package: "com.android.ipsec.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.launcher3/Android.bp b/aconfig/trunk_staging/com.android.launcher3/Android.bp
index 4afdf836..e20731dc 100644
--- a/aconfig/trunk_staging/com.android.launcher3/Android.bp
+++ b/aconfig/trunk_staging/com.android.launcher3/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.launcher3-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.launcher3-all",
   package: "com.android.launcher3",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.libcore/Android.bp b/aconfig/trunk_staging/com.android.libcore/Android.bp
index b5d18274..a93b40a5 100644
--- a/aconfig/trunk_staging/com.android.libcore/Android.bp
+++ b/aconfig/trunk_staging/com.android.libcore/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.libcore-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.libcore-all",
   package: "com.android.libcore",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp b/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp
index 16411e69..0a4a23ee 100644
--- a/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.libhardware.dynamic.sensors.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.libhardware.dynamic.sensors.flags-all",
   package: "com.android.libhardware.dynamic.sensors.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.aaudio/Android.bp b/aconfig/trunk_staging/com.android.media.aaudio/Android.bp
index d0444d51..ab4257eb 100644
--- a/aconfig/trunk_staging/com.android.media.aaudio/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.aaudio/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.aaudio-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.aaudio-all",
   package: "com.android.media.aaudio",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.audio/Android.bp b/aconfig/trunk_staging/com.android.media.audio/Android.bp
index 910640fc..a813f101 100644
--- a/aconfig/trunk_staging/com.android.media.audio/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.audio/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.audio-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.audio-all",
   package: "com.android.media.audio",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.audioserver/Android.bp b/aconfig/trunk_staging/com.android.media.audioserver/Android.bp
index a4576ac2..eec88c79 100644
--- a/aconfig/trunk_staging/com.android.media.audioserver/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.audioserver/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.audioserver-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.audioserver-all",
   package: "com.android.media.audioserver",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp b/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp
index 9a028b31..ffe5a46f 100644
--- a/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.codec.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.codec.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.codec.flags-all",
   package: "com.android.media.codec.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp b/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp
index 17443b7b..ee9cd139 100644
--- a/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.editing.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.editing.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.editing.flags-all",
   package: "com.android.media.editing.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.flags/Android.bp b/aconfig/trunk_staging/com.android.media.flags/Android.bp
index 1ca5ac01..69c78f67 100644
--- a/aconfig/trunk_staging/com.android.media.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.flags-all",
   package: "com.android.media.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp b/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp
index 5d3da3fd..4830d78e 100644
--- a/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.playback.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.playback.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.playback.flags-all",
   package: "com.android.media.playback.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp b/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp
index 9623430a..8a72918d 100644
--- a/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.media.projection.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.media.projection.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.media.projection.flags-all",
   package: "com.android.media.projection.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.nfc.flags/Android.bp b/aconfig/trunk_staging/com.android.nfc.flags/Android.bp
index 68f2a619..4426c973 100644
--- a/aconfig/trunk_staging/com.android.nfc.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.nfc.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.nfc.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.flags-all",
   package: "com.android.nfc.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp b/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp
index 4b3dd618..d8d81c12 100644
--- a/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.nfc.nci.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.nfc.nci.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.nfc.nci.flags-all",
   package: "com.android.nfc.nci.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.permission.flags/Android.bp b/aconfig/trunk_staging/com.android.permission.flags/Android.bp
index 91ab3553..7f4bc3ac 100644
--- a/aconfig/trunk_staging/com.android.permission.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.permission.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.permission.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.permission.flags-all",
   package: "com.android.permission.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.providers.settings/Android.bp b/aconfig/trunk_staging/com.android.providers.settings/Android.bp
index ada46c02..1c1d38e0 100644
--- a/aconfig/trunk_staging/com.android.providers.settings/Android.bp
+++ b/aconfig/trunk_staging/com.android.providers.settings/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.providers.settings-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.providers.settings-all",
   package: "com.android.providers.settings",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp b/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp
index ce3c9eee..6f476697 100644
--- a/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.sdksandbox.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.sdksandbox.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.sdksandbox.flags-all",
   package: "com.android.sdksandbox.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.accessibility/Android.bp b/aconfig/trunk_staging/com.android.server.accessibility/Android.bp
index 2614f50a..36ef803e 100644
--- a/aconfig/trunk_staging/com.android.server.accessibility/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.accessibility/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.accessibility-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.accessibility-all",
   package: "com.android.server.accessibility",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.alarm/Android.bp b/aconfig/trunk_staging/com.android.server.alarm/Android.bp
index ceafb7cb..87e401f7 100644
--- a/aconfig/trunk_staging/com.android.server.alarm/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.alarm/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.alarm-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.alarm-all",
   package: "com.android.server.alarm",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.am/Android.bp b/aconfig/trunk_staging/com.android.server.am/Android.bp
index bab3fdf7..a0b8197f 100644
--- a/aconfig/trunk_staging/com.android.server.am/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.am/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.am-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.am-all",
   package: "com.android.server.am",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.backup/Android.bp b/aconfig/trunk_staging/com.android.server.backup/Android.bp
index 3caf637a..2fa2757c 100644
--- a/aconfig/trunk_staging/com.android.server.backup/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.backup/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.backup-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.backup-all",
   package: "com.android.server.backup",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.biometrics/Android.bp b/aconfig/trunk_staging/com.android.server.biometrics/Android.bp
index 8134960b..4fbd1761 100644
--- a/aconfig/trunk_staging/com.android.server.biometrics/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.biometrics/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.biometrics-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.biometrics-all",
   package: "com.android.server.biometrics",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp b/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
index 4be49a11..48162597 100644
--- a/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.companion.virtual/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.companion.virtual-all",
+  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.deviceconfig/Android.bp b/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp
index c1700d35..f3a9ac74 100644
--- a/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.deviceconfig/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.deviceconfig-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.deviceconfig-all",
   package: "com.android.server.deviceconfig",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp b/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
index 597bc671..15aca736 100644
--- a/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.deviceidle/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.deviceidle-all",
+  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.display.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp
index 7352189f..8d5aa13e 100644
--- a/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.display.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.display.feature.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.display.feature.flags-all",
   package: "com.android.server.display.feature.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp
index 7ef0c57b..1ebed69a 100644
--- a/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.feature.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.feature.flags-all",
   package: "com.android.server.feature.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.flags/Android.bp b/aconfig/trunk_staging/com.android.server.flags/Android.bp
index b98d62ae..699b7b10 100644
--- a/aconfig/trunk_staging/com.android.server.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.flags-all",
   package: "com.android.server.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.job/Android.bp b/aconfig/trunk_staging/com.android.server.job/Android.bp
index 61df9277..273287bc 100644
--- a/aconfig/trunk_staging/com.android.server.job/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.job/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.job-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.job-all",
   package: "com.android.server.job",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.net/Android.bp b/aconfig/trunk_staging/com.android.server.net/Android.bp
index 6254ce56..f84099d4 100644
--- a/aconfig/trunk_staging/com.android.server.net/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.net/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.net-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.net-all",
   package: "com.android.server.net",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.notification/Android.bp b/aconfig/trunk_staging/com.android.server.notification/Android.bp
index c59a1382..98d19987 100644
--- a/aconfig/trunk_staging/com.android.server.notification/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.notification/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.notification-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.notification-all",
   package: "com.android.server.notification",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp
index b5d446f1..6c727e5a 100644
--- a/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.policy.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.policy.feature.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy.feature.flags-all",
   package: "com.android.server.policy.feature.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.policy/Android.bp b/aconfig/trunk_staging/com.android.server.policy/Android.bp
index d51c1bf6..d985843e 100644
--- a/aconfig/trunk_staging/com.android.server.policy/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.policy/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.policy-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.policy-all",
   package: "com.android.server.policy",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp b/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp
index 6c1d37d4..1106e06d 100644
--- a/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.power.feature.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.power.feature.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.feature.flags-all",
   package: "com.android.server.power.feature.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp b/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp
index 427e52c9..30c2255f 100644
--- a/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.power.optimization/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.power.optimization-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.power.optimization-all",
   package: "com.android.server.power.optimization",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.stats/Android.bp b/aconfig/trunk_staging/com.android.server.stats/Android.bp
index 2f2660a8..210ebaeb 100644
--- a/aconfig/trunk_staging/com.android.server.stats/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.stats/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.stats-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.stats-all",
   package: "com.android.server.stats",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp b/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp
index 919b7094..f0612449 100644
--- a/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.telecom.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.telecom.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.telecom.flags-all",
   package: "com.android.server.telecom.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp b/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp
index 6fdef0e3..141e9ca2 100644
--- a/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.usb.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.usb.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.usb.flags-all",
   package: "com.android.server.usb.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.server.utils/Android.bp b/aconfig/trunk_staging/com.android.server.utils/Android.bp
index 76d4c77e..cf2204ae 100644
--- a/aconfig/trunk_staging/com.android.server.utils/Android.bp
+++ b/aconfig/trunk_staging/com.android.server.utils/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.server.utils-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.server.utils-all",
   package: "com.android.server.utils",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp b/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp
index e03f9af7..0a007f5b 100644
--- a/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp
+++ b/aconfig/trunk_staging/com.android.settings.accessibility/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settings.accessibility-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.accessibility-all",
   package: "com.android.settings.accessibility",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settings.development/Android.bp b/aconfig/trunk_staging/com.android.settings.development/Android.bp
index b0c814cd..0bb7b80c 100644
--- a/aconfig/trunk_staging/com.android.settings.development/Android.bp
+++ b/aconfig/trunk_staging/com.android.settings.development/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settings.development-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.development-all",
   package: "com.android.settings.development",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp b/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp
index 489a0fac..afd6f030 100644
--- a/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp
+++ b/aconfig/trunk_staging/com.android.settings.factory_reset/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settings.factory_reset-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.factory_reset-all",
   package: "com.android.settings.factory_reset",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settings.flags/Android.bp b/aconfig/trunk_staging/com.android.settings.flags/Android.bp
index ca9006e0..a0f39b39 100644
--- a/aconfig/trunk_staging/com.android.settings.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.settings.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settings.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.flags-all",
   package: "com.android.settings.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp b/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp
index 0e90bdf9..476eba28 100644
--- a/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp
+++ b/aconfig/trunk_staging/com.android.settings.media_drm/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settings.media_drm-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settings.media_drm-all",
   package: "com.android.settings.media_drm",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp
index 11710dd4..a1ec057d 100644
--- a/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.settingslib.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settingslib.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.flags-all",
   package: "com.android.settingslib.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp b/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp
index 48026036..8183e62a 100644
--- a/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.settingslib.media.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.settingslib.media.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.settingslib.media.flags-all",
   package: "com.android.settingslib.media.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp
index 18d21102..80b97aa9 100644
--- a/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.system.virtualmachine.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.system.virtualmachine.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.system.virtualmachine.flags-all",
   package: "com.android.system.virtualmachine.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp
index e98bbd90..343e187d 100644
--- a/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp
+++ b/aconfig/trunk_staging/com.android.systemui.accessibility.accessibilitymenu/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.accessibility.accessibilitymenu-all",
   package: "com.android.systemui.accessibility.accessibilitymenu",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.systemui.car/Android.bp b/aconfig/trunk_staging/com.android.systemui.car/Android.bp
index b56ea411..a51a810f 100644
--- a/aconfig/trunk_staging/com.android.systemui.car/Android.bp
+++ b/aconfig/trunk_staging/com.android.systemui.car/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.systemui.car-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.car-all",
   package: "com.android.systemui.car",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.systemui.shared/Android.bp b/aconfig/trunk_staging/com.android.systemui.shared/Android.bp
index 8c18d8f0..20d267e6 100644
--- a/aconfig/trunk_staging/com.android.systemui.shared/Android.bp
+++ b/aconfig/trunk_staging/com.android.systemui.shared/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.systemui.shared-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui.shared-all",
   package: "com.android.systemui.shared",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.systemui/Android.bp b/aconfig/trunk_staging/com.android.systemui/Android.bp
index b825d1aa..5667b8c5 100644
--- a/aconfig/trunk_staging/com.android.systemui/Android.bp
+++ b/aconfig/trunk_staging/com.android.systemui/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.systemui-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.systemui-all",
   package: "com.android.systemui",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.text.flags/Android.bp b/aconfig/trunk_staging/com.android.text.flags/Android.bp
index 339547e5..73d97028 100644
--- a/aconfig/trunk_staging/com.android.text.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.text.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.text.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.text.flags-all",
   package: "com.android.text.flags",
   srcs: [
     "*_flag_values.textproto",
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
index 83e94275..6e57a652 100644
--- a/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp
+++ b/aconfig/trunk_staging/com.android.trunk_stable_workflow_testing/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.trunk_stable_workflow_testing-all",
+  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.uwb.flags/Android.bp b/aconfig/trunk_staging/com.android.uwb.flags/Android.bp
index 346c183e..f5ad15f5 100644
--- a/aconfig/trunk_staging/com.android.uwb.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.uwb.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.uwb.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.uwb.flags-all",
   package: "com.android.uwb.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.wallpaper/Android.bp b/aconfig/trunk_staging/com.android.wallpaper/Android.bp
index 856eca5c..d587ffee 100644
--- a/aconfig/trunk_staging/com.android.wallpaper/Android.bp
+++ b/aconfig/trunk_staging/com.android.wallpaper/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.wallpaper-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.wallpaper-all",
   package: "com.android.wallpaper",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.wifi.flags/Android.bp b/aconfig/trunk_staging/com.android.wifi.flags/Android.bp
index 10bb1b9f..0bd6afa5 100644
--- a/aconfig/trunk_staging/com.android.wifi.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.wifi.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.wifi.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.wifi.flags-all",
   package: "com.android.wifi.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.window.flags/Android.bp b/aconfig/trunk_staging/com.android.window.flags/Android.bp
index ba9a8f46..db336430 100644
--- a/aconfig/trunk_staging/com.android.window.flags/Android.bp
+++ b/aconfig/trunk_staging/com.android.window.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.window.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.window.flags-all",
   package: "com.android.window.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.android.wm.shell/Android.bp b/aconfig/trunk_staging/com.android.wm.shell/Android.bp
index 1baca28c..b82d5e2a 100644
--- a/aconfig/trunk_staging/com.android.wm.shell/Android.bp
+++ b/aconfig/trunk_staging/com.android.wm.shell/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.android.wm.shell-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.android.wm.shell-all",
   package: "com.android.wm.shell",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp
index 902bc5df..9192c0b3 100644
--- a/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp
+++ b/aconfig/trunk_staging/com.example.android.aconfig.demo.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.example.android.aconfig.demo.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.example.android.aconfig.demo.flags-all",
   package: "com.example.android.aconfig.demo.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp b/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp
index 0fc966e1..2cb4200f 100644
--- a/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp
+++ b/aconfig/trunk_staging/com.google.android.iwlan.flags/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 aconfig_values {
-  name: "aconfig-values-aosp-trunk_staging-com.google.android.iwlan.flags-all",
+  name: "aconfig-values-platform_build_release-trunk_staging-com.google.android.iwlan.flags-all",
   package: "com.google.android.iwlan.flags",
   srcs: [
     "*_flag_values.textproto",
diff --git a/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto
index 1fbac459..2b0a171d 100644
--- a/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto
+++ b/flag_declarations/RELEASE_AVF_ENABLE_NETWORK.textproto
@@ -1,8 +1,8 @@
-name: "RELEASE_AVF_ENABLE_NETWORK"
-namespace: "android_UNKNOWN"
-description: "Adds supports for network functionality in VMs."
-value: {
-  bool_value: false
+name:  "RELEASE_AVF_ENABLE_NETWORK"
+namespace:  "android_UNKNOWN"
+description:  "Adds supports for network functionality in VMs."
+value:  {
+  bool_value:  false
 }
-workflow: LAUNCH
-containers: "system"
+workflow:  LAUNCH
+containers:  "system"
diff --git a/flag_values/ap2a/RELEASE_BOARD_API_LEVEL_FROZEN.textproto b/flag_values/ap2a/RELEASE_BOARD_API_LEVEL_FROZEN.textproto
new file mode 100644
index 00000000..9067f1de
--- /dev/null
+++ b/flag_values/ap2a/RELEASE_BOARD_API_LEVEL_FROZEN.textproto
@@ -0,0 +1,4 @@
+name:  "RELEASE_BOARD_API_LEVEL_FROZEN"
+value:  {
+  bool_value:  true
+}
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto b/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
index f7a34bcf..878b3408 100644
--- a/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
+++ b/flag_values/ap2a/RELEASE_PLATFORM_SECURITY_PATCH.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_PLATFORM_SECURITY_PATCH"
 value:  {
-  string_value:  "2024-04-05"
+  string_value:  "2024-06-05"
 }
diff --git a/flag_values/ap2a/RELEASE_PLATFORM_VERSION.textproto b/flag_values/ap2a/RELEASE_PLATFORM_VERSION.textproto
deleted file mode 100644
index 3a572393..00000000
--- a/flag_values/ap2a/RELEASE_PLATFORM_VERSION.textproto
+++ /dev/null
@@ -1,4 +0,0 @@
-name:  "RELEASE_PLATFORM_VERSION"
-value:  {
-  string_value:  "UP1A"
-}
diff --git a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
index 2594a9fe..1525e3ea 100644
--- a/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
+++ b/flag_values/trunk_staging/RELEASE_AVF_ENABLE_NETWORK.textproto
@@ -1,4 +1,4 @@
-name: "RELEASE_AVF_ENABLE_NETWORK"
-value: {
-  bool_value: true
+name:  "RELEASE_AVF_ENABLE_NETWORK"
+value:  {
+  bool_value:  true
 }
diff --git a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto b/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
index ced836ea..4a4b910f 100644
--- a/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
+++ b/flag_values/trunk_staging/RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN.textproto
@@ -1,4 +1,4 @@
 name:  "RELEASE_LIBPOWER_NO_LOCK_BINDER_TXN"
-value: {
-  bool_value: true
+value:  {
+  bool_value:  true
 }
diff --git a/release_config_map.textproto b/release_config_map.textproto
index 83ccbb32..5dae1535 100644
--- a/release_config_map.textproto
+++ b/release_config_map.textproto
@@ -1,3 +1,7 @@
+aliases: {
+  name: "aosp_current"
+  target: "ap2a"
+}
 description:  "Public open-source flag declarations and values"
 default_containers:  "product"
 default_containers:  "system"
diff --git a/release_configs/ap2a.textproto b/release_configs/ap2a.textproto
index 9d984cc2..3e8aa460 100644
--- a/release_configs/ap2a.textproto
+++ b/release_configs/ap2a.textproto
@@ -1,2 +1,2 @@
 name:  "ap2a"
-aconfig_value_sets:  "aconfig_value_set-aosp-ap2a"
+aconfig_value_sets:  "aconfig_value_set-platform_build_release-ap2a"
diff --git a/release_configs/trunk_staging.textproto b/release_configs/trunk_staging.textproto
index dd6a7abf..a0a5587a 100644
--- a/release_configs/trunk_staging.textproto
+++ b/release_configs/trunk_staging.textproto
@@ -1,2 +1,2 @@
 name:  "trunk_staging"
-aconfig_value_sets:  "aconfig_value_set-aosp-trunk_staging"
+aconfig_value_sets:  "aconfig_value_set-platform_build_release-trunk_staging"