Merge "Skip test when NAN or RTT feature not supported" into rvc-dev am: c70e5e0830

Change-Id: Ie91fa55490b5204451c4aeafeee6594805afb6ea