Merge "Clean up deleted users in DevicePolicyManagerService"