Merge "Remove unused Vpn Dependency methods in VpnTest." into main