Merge "Supplicant: Add support to configure and indicate additional vendor data" into main