[VTS][NAN] Fix VTS tests: didn't abort early enough for non-NAN devices
am: 1acc63f9cf

Change-Id: I7d306db29ebc8092e8e6bd99dd4836d457433b15