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

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

Change-Id: I2d5be618227828a815867144c1e29c826ba3c2ab