Merge "Wifi: fix p2p vts failure on no p2p support devices"