[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: b2d1b675 am: b4dcaa4f

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

Change-Id: I51fe6aa70673b0249659fc950b8919da642abe22