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

Change-Id: I3a85c77d662d9225a05214380d9544115f1351bd