Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev