You can simply or the two voltages together with a pair of diodes. Power will
be drawn from whichever sourve has the larger voltage.