Merge "Logging improvements on DevicePolicyManagerService classes:" into sc-dev