[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

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

Change-Id: Ie4d3b401464424fab27036553962b7173f7c5575