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

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

Change-Id: I2a2ad87e7892c5e0e8da6594fda52158b1bccc7d