Merge "Clean up exception usage in LockSettingsService (part 1)"