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

am skip reason: skipped by user pateljay

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

Change-Id: I99d030a886a48f5f27f664f399ba494cd84ff818