How about a lockdown feature that sends the unlock code to a trusted 3rd party? For corporate phones that should work quite nicely, especially if unlocking would require physical connection to the trusted network.

That way you could simply put it into lockdown mode before you enter border checks and not use the phone except for minimal calling features.