Merge "[wpa_supplicant] cumilative patch from commit bb945b98f" into udc-dev am: 1b0d9d6e4b

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

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