Merge "[wpa_supplicant] Fix merge error that broke VtsHalWifiSupplicantP2pV1_0Target" into qt-dev am: bd9d83deac
am: 9916469bd3

Change-Id: I0d1246cb84dd8c0379395cf813a426974c25c98e