Merge "[LockSettings] fail hard when there's an error enrolling"