You can upload your own music to YouTube music, and the music I had previously uploaded to Google music was migrated over at some point (but I think there were manual steps involved, which may no longer be available).