Merge "Wifi: P2P VTS tests fail with no P2P support" am: a4a390c0d9 am: f44059b065

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

Change-Id: I656eec9ad70552d2805d616964fe2e81597b2daf