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

Change-Id: I5be004151117cca95e15bcde2132970d12e2270e