[automerger skipped] Merge "Merge Android 12" am: 2c96e01286 -s ours am: 4c588e2d15 -s ours am: 673af1cd11 -s ours am: d435d3abd9 -s ours am: d4dc2210a6 -s ours

am skip reason: Merged-In I264384190bf2ef047afc6503538fd4496597ba33 with SHA-1 12405a05cf is already in history

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

Change-Id: Ic7835c49b38a636d9c3beb882b17f4348b5d7c5f