Merge changes from topics "bluetooth_auto_on_basic_implementation", "bluetooth_auto_on_hidden_listener", "bluetooth_auto_on_system_api" into main

* changes:
  BluetoothSystemServer: add Hidden AutoOn metrics
  BluetoothSystemServer: add AutoOn user metrics counter
  BluetoothSystemServer: add AutoOn metrics counter
diff --git a/stats/express/catalog/bluetooth.cfg b/stats/express/catalog/bluetooth.cfg
index 6768534..1f71c67 100644
--- a/stats/express/catalog/bluetooth.cfg
+++ b/stats/express/catalog/bluetooth.cfg
@@ -49,3 +49,48 @@
     owner_email: "rotkiewicz@google.com"
     unit: UNIT_COUNT
 }
+
+express_metric {
+    id: "bluetooth.value_auto_on_supported"
+    type: COUNTER
+    display_name: "Auto on -- support"
+    description: "How many times the Bluetooth start with AutoOnFeature supported"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_triggered"
+    type: COUNTER
+    display_name: "Auto on -- trigger"
+    description: "How many times the Bluetooth restart because of AutoOnFeature"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_disabled"
+    type: COUNTER
+    display_name: "Auto on -- disabled"
+    description: "How many times the user manually disable the AutoOnFeature"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_enabled"
+    type: COUNTER
+    display_name: "Auto on -- enabled"
+    description: "How many times the user manually enable the AutoOnFeature"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}
+
+express_metric {
+    id: "bluetooth.value_auto_on_hidden_usage"
+    type: COUNTER
+    display_name: "Auto on -- usage of pre-V hidden API"
+    description: "How many times the AutoOnFeature is used on device prior to V"
+    owner_email: "wescande@google.com"
+    unit: UNIT_COUNT
+}