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

am skip reason: Merged-In I8458f223fc35fcfa042588e67a30c5bb273b0277 with SHA-1 a880e567 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3258250



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