Merge "[wpa_supplicant] Cumulative patch from commit 59e9794c7" into sc-dev am: 8fca585d33

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9bc6c72acb2b717ec53065242a3574edd7f3c4aa