[automerger skipped] Merge "Merge Android 12 QPR1" am: 258878924d -s ours am: 5ae138f16e -s ours am: 2c30fee9a6 -s ours

am skip reason: Merged-In I325e71d4f7ba1fbf8dfbe2c7dff3067520a799fd with SHA-1 15ab8967bb is already in history

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

Change-Id: I0ad017fb64919ab286615dfc93c11f1d29d61b27