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

Change-Id: I7d96a3b12e213b914cbe4b38b5eaed70bead0389