Merge "Fix javadoc for enabling backup in DevicePolicyManager"