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

Change-Id: I12b8d0331af03ea9d7a1a6212c68d6240e69d3f4