[automerger skipped] vts: wifi: softap and p2p are optional feature per CDD am: 80d7ad36bc am: e6387767ac -s ours am: 7cd1cef251

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/1322776

Change-Id: I066ac72a21991094481fac38560ae7155c722279