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

Change-Id: I5e0c3626f01a7158e3d1a818a38ea9cd53cd2111