[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: 7fe307f0 -s ours
am skip reason: Change-Id I04bfffe9dc587e3f7209601c3712422b6e2d165c with SHA-1 8c0fec12 is in history
Change-Id: Ic2e2cdf7a455e08974d2e946b04c08d3a039716a