[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 am: 19785d25 am: 2584f460 am: 5e9f7ac1 am: deccc5a4

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

Change-Id: Ib70a2efaaed719ae0bb7df5e2eabd46334ff8fbe