Merge "CDD:  Require indicating to the user the impact of TrustAgentService on screen locks." into oc-dev