Tetris "Type A" and "Type B" renditions were in the Brawl OST, and those Brawl versions are in the Ultimate OST. I really loved their rendition of "Type B".
Yoko Shimomura arranged "Type A" and Masafumi Takada "Type B".
They've never covered "Type C" though!
If you've got an hour to spare, check out this fan-fucking-tastic documentary that Gaming Historian did on the complications licensing Tetris. It's a wonderful story that I'd love to see a feature length film about one day. You'll see how a very compelling series of events landed it (twice) on the NES. The troubles they encountered are legendary. It may shed some light on why Nintendo decided to give the IP less representation in Smash. I can understand why they took the "homage" route.