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

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

Change-Id: I4ffdf57491f366c4c77611e2c46197343acda526