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

Change-Id: Ib3e04e5b67a22235d384a83de8a160741cd77773