Create "mediametrics_to_module" flag am: a889a61487 am: d1d4279cc1 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3341086 Change-Id: Idc11dbced3744ed68d5ba5b9b9399937cc134898 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

diff --git a/flags/Android.bp b/flags/Android.bp
index d38820e..69a6ce7 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp

@@ -18,12 +18,13 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// ----
 aconfig_declarations {
     name: "media_mainline_aconfig_flags",
     package: "com.android.media.mainline.flags",
     container: "com.android.media",
     srcs: [
-        "**/*.aconfig",
+        "flags.aconfig",
     ],
 }
 
@@ -39,3 +40,29 @@
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
     min_sdk_version: "29",
 }
+
+// ----
+// NB: mediametrics in the module is >= SDK 35
+aconfig_declarations {
+    name: "media_metrics_aconfig_flags",
+    package: "com.android.media.metrics.flags",
+    container: "com.android.media",
+    exportable: true,
+    srcs: [
+        "mediametrics.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "media_metrics_flags_java_lib",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+    aconfig_declarations: "media_metrics_aconfig_flags",
+    mode: "exported",
+    visibility: [
+        "//packages/modules/Media:__subpackages__",
+    ],
+    apex_available: [
+        "com.android.media",
+    ],
+    min_sdk_version: "35",
+}

diff --git a/flags/mediametrics.aconfig b/flags/mediametrics.aconfig
new file mode 100644
index 0000000..14538e8
--- /dev/null
+++ b/flags/mediametrics.aconfig

@@ -0,0 +1,10 @@
+package: "com.android.media.metrics.flags"
+container: "com.android.media"
+
+flag {
+  name: "mediametrics_to_module"
+  namespace: "media"
+  description: "Move android.media.metrics.* to androd.media.metrics.module in module"
+  bug: "189976186"
+  is_exported: true
+}