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

Change-Id: I2857045d95705b00f96cd5cdb69b3fea0cfb1f8d