Merge "Create wpa_supplicant vendor apex" into main