[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 8aec221e1b -s ours

am skip reason: Merged-In I5854f4726a3f40c936b03ec7ce0a511a1e49c383 with SHA-1 5f7131511f is already in history

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

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