[automerger skipped] Merge "Merge Android 12" am: 2c96e01286 -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: I37f314d33f01b97d06cc52deea7aaca94a7c954f