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

am skip reason: subject contains skip directive

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

Change-Id: I97ef748f2c90c5e88185694b6e60b1554bcf059f