[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

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

Change-Id: Ib5c0fec5d1c37964e3c50214e18578829f918e60