Merge "Revert "Update getRadioInterfaceCapabilities return type""