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

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

Change-Id: Iaf83f32fa50d10b245baaa4a7d4de134bfc31739