[wpa_supplicant] cumilative patch from commit d3ed34ba am: 640215c44f am: 511de2f67a

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

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