[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: c80eab95a7 -s ours

am skip reason: Merged-In If459e2d5e31c685b331fbf52273a1f1ea8072b32 with SHA-1 47af8d907c is already in history

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

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