[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 am: ef48ac19 -s ours
am skip reason: Change-Id I04bfffe9dc587e3f7209601c3712422b6e2d165c with SHA-1 9b7015c5 is in history
Change-Id: I753f97072bf2900c163bd2f62ed0bbcf70c7b845