Merge "[BluetoothMetrics]: Adding RDI information within atom for Profile Connection" into main
diff --git a/stats/atoms.proto b/stats/atoms.proto
index 8ed4420..c0205b9 100644
--- a/stats/atoms.proto
+++ b/stats/atoms.proto
@@ -1133,6 +1133,7 @@
     extensions 821; // NegotiatedSecurityAssociation negotiated_security_association
     extensions 850; // VpnConnectionStateChanged vpn_connection_state_changed
     extensions 851; // VpnConnectionReported vpn_connection_reported
+    extensions 853; // ExcessiveBinderProxyCountReported excessive_binder_proxy_count_reported
     extensions 9999; // Atom9999 atom_9999
     // StatsdStats tracks platform atoms with ids up to 900.
     // Update StatsdStats::kMaxPushedAtomId when atom ids here approach that value.
diff --git a/stats/atoms/framework/framework_extension_atoms.proto b/stats/atoms/framework/framework_extension_atoms.proto
index a7d9df4..f59c348 100644
--- a/stats/atoms/framework/framework_extension_atoms.proto
+++ b/stats/atoms/framework/framework_extension_atoms.proto
@@ -32,6 +32,8 @@
     optional UserRiskEventReported user_risk_event_reported = 725 [(module) = "framework"];
     optional MediaProjectionStateChanged media_projection_state_changed = 729 [(module) = "framework"];
     optional MediaProjectionTargetChanged media_projection_target_changed = 730 [(module) = "framework"];
+    optional ExcessiveBinderProxyCountReported excessive_binder_proxy_count_reported = 853
+            [(module) = "framework"];
     optional ProxyBytesTransferByFgBg proxy_bytes_transfer_by_fg_bg = 10200 [(module) = "framework"];
 }
 
@@ -396,3 +398,14 @@
 
   optional int64 tx_packets = 6;
 }
+
+/**
+ * Logs when there are too many binder proxies sent from certain UID to the system.
+ *
+ * Logged from:
+ *   frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java
+ *
+ */
+message ExcessiveBinderProxyCountReported {
+    optional int32 offending_uid = 1 [(is_uid) = true];
+}
diff --git a/stats/express/catalog/bluetooth.cfg b/stats/express/catalog/bluetooth.cfg
index 600a001..271cacc 100644
--- a/stats/express/catalog/bluetooth.cfg
+++ b/stats/express/catalog/bluetooth.cfg
@@ -85,12 +85,3 @@
     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
-}