Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev
am: 266d07f3cb

Change-Id: I6f6dcbb7fe35ec7809ea0f9e67186c18d496ba12