Merge "Safecty checker improvements on DevicePolicyManagerService." into sc-dev