I'm not aware of a straight forward way to bake the two maps together. There's several ways to combine separate textures with photo-editors like Photoshop, GIMP, and Krita. You could also do it with Blender's compositing nodes, but that's arguably the harder way to go about it.