[automerger skipped] Merge "Skip test when NAN or RTT feature not supported"...
[automerger skipped] Merge "Skip test when NAN or RTT feature not supported" into rvc-dev am: c70e5e08 -s ours
am skip reason: Change-Id I04bfffe9dc587e3f7209601c3712422b6e2d165c with SHA-1 9b7015c5 is in history
Change-Id: I3bb1cf50737e418371b91f517f0b7094bfe50940