[automerger skipped] Merge 24Q3 to AOSP main am: 7d48cac2f7 -s ours

am skip reason: Merged-In I39af4942588c276f7a3d66b2920a17f87d820647 with SHA-1 1103ea228d is already in history

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

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