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

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

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