[automerger skipped] Merge "[wpa_supplicant] cumilative patch from commit bb945b98f" into udc-dev am: 1b0d9d6e4b am: bd384b8d6b -s ours

am skip reason: Merged-In I1eb61fc82b98b937a2ff37a30e60e28129fe143d with SHA-1 036cec531d is already in history

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

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