I don't see how a civic data trust is mutually exclusive with a surveillance state — it just provides common ownership and open access to the surveillance data. It seems Cavoukian's dispute centered on the lack of a requirement for third-party (non-Alphabet) data providers to anonymize data at the source.