Merge "[VTS] Seperate Nan and Rtt from Sap test" into rvc-dev am: 7f304d738b

Change-Id: I14204fb7d16cd2e8383e4c8675ea1bf55db93c78