Merge "More DevicePolicyManager operations with safety checker for device management"