Is all this inconvenient? Absolutely. But it’s the only sane course of action when you consider the gravity of your data falling into the wrong hands.
I’ll never bring my phone on an international flight again. Neither should you.
Quincy Larson

It sounds like there is a need for new products that make this process convenient: easier ways to take and save a snapshot of the state of the phone before a flight that can be retrieved and restored after a flight.