Sounds like the issue is with e2ee apps than the phone os itself. In any case, Apple and Google will soon bypass e2ee with client-side scanning (if they aren't doing it already).