Merge "supplicant(vts): Skip p2p tests on non-p2p devices as intended" into android11-tests-dev