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

Change-Id: Ic34bdbb938bf623b8fbc94d93c102046c44e6df5