[wpa_supplicant] Cumulative patch from commit ac1e3a7f0 am: c1a2144e79

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

Change-Id: Ief200db969240145b4be974a0904d0ca061ee8fb