I understand the argument but disagree with the premise. This is a matter of a duly elected government being able to exercise its legitimate police power. You shouldn't get to hide from a search warrant; that's the price we pay for living under a constitutional system and the rule of law. Just because I acknowledge that it's difficult for technology to distinguish between the CCP and a signed warrant from an American or European judge doesn't mean I think the latter should be a dead letter. If there's a warrant to search your devices from the legitimate government of a liberal democracy the so-called "promises" a company gave you shouldn't matter for a damn.
That's all pie in the sky, and I understand the reasons why in reality international companies are leery of China or Russia (or hey, Saudi Arabia) coming in and saying "but what about OUR warrants?" But dammit, it's way less than optimal, and this Saudi terrorist asshole is Exhibit "A."