Merge "Revert "VTS for IRadio AIDL""