[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: e333ba2c02 -s ours

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

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

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