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: I0334d203cb6b4350a61957f34e47724b1ce85dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>