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

Change-Id: I97aa533171befcd7aea12c6dde8c9574335da474