[automerger skipped] Merge Android 12L am: f73f435b93 -s ours am: 664480ce84 -s ours am: 1c283d67e3 -s ours

am skip reason: Merged-In I1d3b32663167d200c4aad5f9fac0b52d3ddde5c2 with SHA-1 82ccf35e43 is already in history

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

Change-Id: I5d915d34f680bf01df263585f5987b6ab8ac82ca