[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 239b876d4e -s ours

am skip reason: Merged-In I1ab30ffeefcfd9e988dbf01d6ad7080798cc588e with SHA-1 8211a66b35 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/27273339

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