Merge "supplicant(vts): Skip p2p tests on non-p2p devices as intended" am: f19e282226

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1497700

Change-Id: I694d4cd21dcfd79ea5fdc1993efb7df59178c03c