Merge "Revert "Avoid LockSettingsService NPE during CTS due to races around user removal.""