[automerger skipped] Merge "vts: wifi: softap and p2p are optional feature per...

[automerger skipped] Merge "vts: wifi: softap and p2p are optional feature per CDD" into pie-vts-dev am: a5f27a46 -s ours am: a9b08c3a am: 7a0d9f5b -s ours

am skip reason: skipped by user shihju

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

Change-Id: Ibdeb67d5100219272ea48f55b952dd563d3637e9