[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 561c74d4bd -s ours

am skip reason: Merged-In Iba09c7e223061f452a0be23c2173792c78bf7205 with SHA-1 b8acd2a860 is already in history

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

Change-Id: Ibe490661f72fc8873754518ffbb831aa77f70e5b