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