[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 am: 866ba262 -s ours am: 09936c8c am: 723fe345 am: de90ba21

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

Change-Id: I687fc536399c32efb656127d80b39bd445ab0d7d