As usual, I bet Apple is one step ahead of them, and if the FBI keeps threatening, Apple will just make an easy encryption/decryption system for its users, with its elements created by them. It’s not particularly hard, other than creating an interface.
For example, give them a blank screen, then ask them to draw on it with their finger, scribbles if they like, for a minimum of say, one minute. Throw away the first five and last five seconds, then use it as the seed to a randomizer.
There’s a vast number of things Apple could do, that it could not undo or break into.
Two Factor Passwords fk the gubmint.
They are good but, the person who starts to crack a “Two Factor” will be dead before those files are ever revealed.