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

Change-Id: I6968281df878be9c0ae0df4bd03d729cc514c52b