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

Change-Id: I4134c6c97d1a8338fc0ba8c0cf0973e3479523ab