[automerger skipped] Merge "vts: wifi: softap and p2p are optional feature per CDD" into pie-vts-dev am: a5f27a462e am: 866ba26264 -s ours am: 09936c8c82 am: 723fe3456f am: de90ba21fd am: 19785d2519 am: 2584f4609b am: 5e9f7ac174 am: deccc5a4cb

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

Change-Id: Ib70a2efaaed719ae0bb7df5e2eabd46334ff8fbe