[automerger skipped] Merge "Prepares wpa_supplicant for use by a wifi HAL vendor APEX." am: 48cbfd9c96 am: 8127421f53 am: 9edcfbe3dd am: 194853e1fc am: bad562f8ec -s ours

am skip reason: skipped by user danielnorman

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

Change-Id: I65465e99b4aa3e60d3f1cd2d0f3e6dc18fe11d6e