[wpa_supplicant] Cumulative patch from commit 257b119c2 am: 77d572f143

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

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