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

Change-Id: I0eed02ecb97c5908b28516c139b4c483cdff4841