[automerger skipped] Merge 24Q4 into AOSP main am: f0877db975 -s ours

am skip reason: Merged-In Ib678c12fe7050886efb8ff0faa55a191c6d4fbf1 with SHA-1 6b1ba80992 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Profiling/+/3414019

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