Snap for 10476488 from 68379a5aa89d6ba515ef910af03f392398d7fabf to mainline-ipsec-release

Change-Id: Ieb1da2658a859b96766fd5b893a191f4c0fb8bc3
diff --git a/stats/atoms/wifi/wifi_extension_atoms.proto b/stats/atoms/wifi/wifi_extension_atoms.proto
index 7635858..d4e889f 100644
--- a/stats/atoms/wifi/wifi_extension_atoms.proto
+++ b/stats/atoms/wifi/wifi_extension_atoms.proto
@@ -250,9 +250,9 @@
     // Whether or not the opportunistic no usage timeout for DBS is enabled
     optional bool is_dbs_timeout_enabled = 12;
     // Band of the DBS instance that failed, if any
-    optional bool dbs_instance_failure_band = 13;
+    optional int32 dbs_instance_failure_band = 13;
     // Band of the DBS instance that timed out, if any
-    optional bool dbs_instance_timeout_band = 14;
+    optional int32 dbs_instance_timeout_band = 14;
     // Upstream transport type at the time of stopping
     optional android.stats.connectivity.TransportType upstream_transport = 15;
 }
diff --git a/stats/enums/adservices/common/adservices_enums.proto b/stats/enums/adservices/common/adservices_enums.proto
index 2417b3c..5fe2abd 100644
--- a/stats/enums/adservices/common/adservices_enums.proto
+++ b/stats/enums/adservices/common/adservices_enums.proto
@@ -223,9 +223,12 @@
   TOPICS_DELETE_TABLE_FAILURE = 1040;
 
   // Measurement errors: 2001-3000
-  // Error eccurred when inserting enrollment data to DB.
+  // Error occurred when inserting enrollment data to DB.
   ENROLLMENT_DATA_INSERT_ERROR = 2001;
 
+  // Error occurred when deleting enrollment data to DB.
+  ENROLLMENT_DATA_DELETE_ERROR = 2002;
+
   // UX errors: 4001-5000
   CONSENT_REVOKED_ERROR = 4001;