[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 9a20af373f -s ours

am skip reason: Merged-In I2d7b02e2d8fbf84431da41163c39af1109fd835c with SHA-1 e1dbf79252 is already in history

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

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