[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: df285311 -s ours

am skip reason: Merged-In Ifc0c83026b2a3ce943c3fd1ee5d0b93ca1dc46b6 with SHA-1 cf82b47a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/30285352



Change-Id: Ib10805d79747fe13a883a1812450c6d2304bde6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>