[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 561c74d4bd -s ours am: a85ceb7dde -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: I724611238fc5a24da9f0f380fbd8b754caec6f2f