[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ef85e60f -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: Idd9cb60e9bfd42f5e703b21829835f4541664337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>