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

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

Change-Id: Icdec2ba35b65517d3a0d93929225d26d28466dcf