[automerger skipped] Merge 10952656 am: 4d57088bfb -s ours am: 3edf42862f -s ours

am skip reason: Merged-In Ifc1d347098bc3aaee2288afbbc945b245dfea431 with SHA-1 102342308d is already in history

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

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