Merge 25Q1 (ab/BP1A.250305.020) to AOSP main

Bug: 385190204
Merged-In: I5e804a665d231ad55ca569d0fc2b15be434e8828
Change-Id: I997bc90d5b881e5cdc133a6d9b4c85415a3817a7

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

 drops {
   android_build_drop {
-    build_id: "12509279"
+    build_id: "12785903"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }

current/Android.bp

@@ -105,6 +105,7 @@ cc_prebuilt_library_shared {
             "30",
             "current",
         ],
+        symbol_file: "libstatspull.map.txt",
     },
     arch: {
         arm64: {
@@ -138,6 +139,7 @@ cc_prebuilt_library_shared {
             "30",
             "current",
         ],
+        symbol_file: "libstatssocket.map.txt",
     },
     arch: {
         arm64: {

current/libstatspull.map.txt

+LIBSTATSPULL {
+    global:
+        AStatsManager_PullAtomMetadata_obtain; # apex introduced=30
+        AStatsManager_PullAtomMetadata_release; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setCoolDownMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getCoolDownMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setTimeoutMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getTimeoutMillis; # apex introduced=30
+        AStatsManager_PullAtomMetadata_setAdditiveFields; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getNumAdditiveFields; # apex introduced=30
+        AStatsManager_PullAtomMetadata_getAdditiveFields; # apex introduced=30
+        AStatsEventList_addStatsEvent; # apex introduced=30
+        AStatsManager_setPullAtomCallback; # apex introduced=30
+        AStatsManager_clearPullAtomCallback; # apex introduced=30
+
+        AStatsManager_addSubscription; # apex introduced=UpsideDownCake
+        AStatsManager_removeSubscription; # apex introduced=UpsideDownCake
+        AStatsManager_flushSubscription; # apex introduced=UpsideDownCake
+    local:
+        *;
+};

current/libstatssocket.map.txt

+LIBSTATSSOCKET {
+    global:
+        AStatsEvent_obtain; # apex introduced=30
+        AStatsEvent_build; # apex introduced=30
+        AStatsEvent_write; # apex introduced=30
+        AStatsEvent_release; # apex introduced=30
+        AStatsEvent_setAtomId; # apex introduced=30
+        AStatsEvent_writeInt32; # apex introduced=30
+        AStatsEvent_writeInt64; # apex introduced=30
+        AStatsEvent_writeFloat; # apex introduced=30
+        AStatsEvent_writeBool; # apex introduced=30
+        AStatsEvent_writeByteArray; # apex introduced=30
+        AStatsEvent_writeString; # apex introduced=30
+        AStatsEvent_writeAttributionChain; # apex introduced=30
+        AStatsEvent_writeInt32Array; # apex introduced=Tiramisu
+        AStatsEvent_writeInt64Array; # apex introduced=Tiramisu
+        AStatsEvent_writeFloatArray; # apex introduced=Tiramisu
+        AStatsEvent_writeBoolArray; # apex introduced=Tiramisu
+        AStatsEvent_writeStringArray; # apex introduced=Tiramisu
+        AStatsEvent_addBoolAnnotation; # apex introduced=30
+        AStatsEvent_addInt32Annotation; # apex introduced=30
+        AStatsSocket_close; # apex introduced=30
+    local:
+        *;
+};
+
+LIBSTATSSOCKET_PRIVATE {
+    global:
+        AStatsEvent_getBuffer;
+        AStatsEvent_getErrors;
+        AStatsEvent_overwriteTimestamp;
+        write_buffer_to_statsd;
+    local:
+        *;
+} LIBSTATSSOCKET;
\ No newline at end of file

current/snapshot-creation-build-number.txt

-12279057
+12712324
\ No newline at end of file