I think the attitude here that most tech companies are rolling over and just complying without a single ethical consideration is misplaced. The government has been doing an excellent job of basically extorting these companies into compliance. They threaten the full weight of the US government's wraith and then tie every order up with classifications and gag orders. You aren't legally allowed to talk to other companie…
So, if citizens continuously allow or even create (surveillance supporters) a police state, then the companies operating in it are under no ethical obligation to take risk to protect them from that police state's activities. Those companies would actually be putting in more effort and taking more risk than most of the citizens themselves. That's an unreasonable expectation.
U.S. citizens need to get their shit straight in this country. Interestingly, the vast majority are pushing for the two most corrupt candidates imaginable for this election who have each mocked the Constitution and support the police state apparatus. Trying to protect them is a lost cause. Better to invest that effort into a different democracy whose people actually give a shit vs this one.