Merge "Wifi: P2P VTS tests fail with no P2P support" into android12-tests-dev