the solution is not to travel with your phone. Most people don't travel that much and do it essentially for holiday. So having a factory reset phone for traveling is totally doable. That's what I do