Merge "wlan: Use different wpa_supplicant.conf between wcn and ath6kl driver"