Android music player that supports grouping songs for shuffling

Hi all, I asked this question a couple years ago but I'm hoping there are some new options these days. I have a Fiio JM21 and I'm looking for any Android music app that lets you "group" together two or more songs so that they always play back-to-back when I'm shuffling a playlist or my library. ITunes on Windows used to have this feature, but I've never found a portable player or app that supports it. Is there anything out there that can do this?

Specifically the way it worked in iTunes was using the "shuffle by group" feature. You could tag multiple tracks with the same "group" tag and when shuffling iTunes would play all the songs with the same group tag back-to-back and then go back to shuffling the playlist. I miss this feature!

Thanks in advance for ANY information you can give me. I would obviously prefer free players but if there's a paid one that has this feature it's a feature I'm willing to pay for.