Merge cherrypicks of ['googleplex-android-review.googlesource.com/26048967', 'googleplex-android-review.googlesource.com/26049284'] into 24Q1-release.android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Iec8ea1c7aa3b91f2a3283f1ecfe375fd2e39801e

22 files changed, 16 insertions, 8 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 7791fb2..548422c 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 9033c0f..e23e45f 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "10917791"
-    target: "mainline_go_modules_sdks-trunk-userdebug"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.go.os.statsd/sdk/statsd-module-sdk-current.zip"
+    build_id: "T1009193"
+    target: "train_build"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.os.statsd/sdk/statsd-module-sdk-current.zip"
   }
   dest_file: "go/current/current.zip"
   version: ""
diff --git a/current/arm/lib/libstatspull.so b/current/arm/lib/libstatspull.so
index dcf88b5..7ddb5ba 100755
--- a/current/arm/lib/libstatspull.so
+++ b/current/arm/lib/libstatspull.so
diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so
index 4214ef2..b4c2891 100755
--- a/current/arm/lib/libstatssocket.so
+++ b/current/arm/lib/libstatssocket.so
diff --git a/current/arm64/lib/libstatspull.so b/current/arm64/lib/libstatspull.so
index 08c8af7..785ed5e 100755
--- a/current/arm64/lib/libstatspull.so
+++ b/current/arm64/lib/libstatspull.so
diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so
index d1aaaa0..27b6a6e 100755
--- a/current/arm64/lib/libstatssocket.so
+++ b/current/arm64/lib/libstatssocket.so
diff --git a/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h b/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
index 23e1419..f131bf5 100644
--- a/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
+++ b/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
@@ -73,6 +73,10 @@ void AStatsEvent_build(AStatsEvent* event);
 
 /**
  * Writes the StatsEvent to the stats log.
+ * For all UIDs except system server:
+ * - Returns number of bytes written into the socket, or socket error code.
+ * For the system_server the write is done via intermediate queue:
+ * - Returns 1 if event was added into the queue, 0 otherwise.
  *
  * After calling this, AStatsEvent_release must be called,
  * and is the only function that can be safely called.
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index fffc196..8b98786 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11083832
\ No newline at end of file
diff --git a/current/x86/lib/libstatspull.so b/current/x86/lib/libstatspull.so
index bbe0774..3f704f6 100755
--- a/current/x86/lib/libstatspull.so
+++ b/current/x86/lib/libstatspull.so
diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so
index f7a2434..c207389 100755
--- a/current/x86/lib/libstatssocket.so
+++ b/current/x86/lib/libstatssocket.so
diff --git a/current/x86_64/lib/libstatspull.so b/current/x86_64/lib/libstatspull.so
index 374b9ae..5dbcddc 100755
--- a/current/x86_64/lib/libstatspull.so
+++ b/current/x86_64/lib/libstatspull.so
diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so
index 6f28f67..d38b424 100755
--- a/current/x86_64/lib/libstatssocket.so
+++ b/current/x86_64/lib/libstatssocket.so
diff --git a/go/current/arm/lib/libstatspull.so b/go/current/arm/lib/libstatspull.so
index dcf88b5..7ddb5ba 100755
--- a/go/current/arm/lib/libstatspull.so
+++ b/go/current/arm/lib/libstatspull.so
diff --git a/go/current/arm/lib/libstatssocket.so b/go/current/arm/lib/libstatssocket.so
index 4214ef2..b4c2891 100755
--- a/go/current/arm/lib/libstatssocket.so
+++ b/go/current/arm/lib/libstatssocket.so
diff --git a/go/current/arm64/lib/libstatspull.so b/go/current/arm64/lib/libstatspull.so
index 08c8af7..785ed5e 100755
--- a/go/current/arm64/lib/libstatspull.so
+++ b/go/current/arm64/lib/libstatspull.so
diff --git a/go/current/arm64/lib/libstatssocket.so b/go/current/arm64/lib/libstatssocket.so
index d1aaaa0..27b6a6e 100755
--- a/go/current/arm64/lib/libstatssocket.so
+++ b/go/current/arm64/lib/libstatssocket.so
diff --git a/go/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h b/go/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
index 23e1419..f131bf5 100644
--- a/go/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
+++ b/go/current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h
@@ -73,6 +73,10 @@ void AStatsEvent_build(AStatsEvent* event);
 
 /**
  * Writes the StatsEvent to the stats log.
+ * For all UIDs except system server:
+ * - Returns number of bytes written into the socket, or socket error code.
+ * For the system_server the write is done via intermediate queue:
+ * - Returns 1 if event was added into the queue, 0 otherwise.
  *
  * After calling this, AStatsEvent_release must be called,
  * and is the only function that can be safely called.
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index fffc196..8b98786 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10917791
\ No newline at end of file
+11083832
\ No newline at end of file
diff --git a/go/current/x86/lib/libstatspull.so b/go/current/x86/lib/libstatspull.so
index bbe0774..3f704f6 100755
--- a/go/current/x86/lib/libstatspull.so
+++ b/go/current/x86/lib/libstatspull.so
diff --git a/go/current/x86/lib/libstatssocket.so b/go/current/x86/lib/libstatssocket.so
index f7a2434..c207389 100755
--- a/go/current/x86/lib/libstatssocket.so
+++ b/go/current/x86/lib/libstatssocket.so
diff --git a/go/current/x86_64/lib/libstatspull.so b/go/current/x86_64/lib/libstatspull.so
index 374b9ae..5dbcddc 100755
--- a/go/current/x86_64/lib/libstatspull.so
+++ b/go/current/x86_64/lib/libstatspull.so
diff --git a/go/current/x86_64/lib/libstatssocket.so b/go/current/x86_64/lib/libstatssocket.so
index 6f28f67..d38b424 100755
--- a/go/current/x86_64/lib/libstatssocket.so
+++ b/go/current/x86_64/lib/libstatssocket.so