[automerger skipped] Merge 24Q4 into AOSP main am: 918c9f524d -s ours am skip reason: Merged-In I413de81a0ea55ef7fe12be9df9f522e0c6b56513 with SHA-1 eb01f51919 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/3411971 Change-Id: I694fbdc8f007022bdc3ed492e680d76ecdcafa9a Signed-off-by: Automerger Merge Worker <[email protected]>