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

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

Change-Id: If1736fe5f7f44b2ab3ed36bd696f66f7cbb09c44