[automerger skipped] Merge "Prepares hostapd for use by a wifi HAL vendor APEX" am: 43a56c115d am: 03d8601ae6 am: b445d690c6 am: 9ca612f294 -s ours

am skip reason: Merged-In Id9937724a397d74c070a0b176c5ec0c18b71c9d1 with SHA-1 4f6ca3ab21 is already in history

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

Change-Id: Iaab8f00acda61a156df5e51280973442c049603e