[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: e9f0fbbfa9 -s ours

am skip reason: Merged-In Ib334629e72c72727e93261df2cf70eee7065bdcb with SHA-1 2b5d3134e9 is already in history

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

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