Merge "wifi(vts): Separate P2P specific tests"