[automerger skipped] Merge "Merge Android 12L" am: 4cd172b463 -s ours am: def7ba6f37 -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: Ifcd0a492fb012fb6e336d32fc55fadb2f53aa0a7