[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: bad0f29998 -s ours

am skip reason: Merged-In Ic93c2ea28eed2f5f392cc8fe366ed10eb6dcac6b with SHA-1 b497cc98ec is already in history

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3257974

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