Merge "Revert "Default Trust Agents are now always enforced."" into oc-dr1-dev
am: 9731c8bfef

Change-Id: I3fff6c1d14b6611a8e2700bc5b6cafcbd2420fa0