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

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

Change-Id: Ica406a4de8dfb04c093d3227a71e860e8727e720