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

Change-Id: I6809f5dade657730ab21de8ce0b33a365c77b47b