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