Merge "[wpa_supplicant] Fix merge error that broke VtsHalWifiSupplicantP2pV1_0Target" into qt-dev