[Draft] Revert "Fix CIV boot failure" and disbale trusty for civ#1830

JaikrishnaNemallapudi wants to merge 1 commit intoprojectceladon:masterprojectceladon/device-androidia:masterfrom

JaikrishnaNemallapudi:tdisJaikrishnaNemallapudi/device-androidia:tdisCopy head branch name to clipboard