Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev
am: 5913ea0554

Change-Id: I22d32e495dd9b2f0567b52713b0071eb95e8ed75