[automerger skipped] Merge ab/6749736 in stage. am: 3ff082d40b -s ours am: 243eb46396 -s ours

am skip reason: Change-Id I97316678d08ab460eccd8bf54fa6642f2c6b4fee with SHA-1 20da6d1e43 is in history

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

Change-Id: I10bd91a9dc9a3deff330b565741282769b8aa130