Merge "Prepares wpa_supplicant for use by a wifi HAL vendor APEX." am: 48cbfd9c96

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

Change-Id: I8569c48ccbb26ce690f16672758365043a2e7de4