There is a very easy solution to this problem. Several countries have been doing this for a while, including Canada. Before you arrive at customs simply go to settings and do a factory reset (make sure you select the option to erase all user data). Make sure everything is backed up in the cloud. Then when you’re outside of customs to a restore and you’re back in business. This is a little annoying, but it is a small price to pay to ensure your data is secure. Happy travels.