Merge "Wifi: fix p2p vts failure on no p2p support devices" am: 189894129c am: 96643ab05c am: 2406c41f21

Change-Id: I406fca1dbafa54b28daf467de2272e8750793222