We no longer need this to be in inside the setup flow when setting up the lock screen. Move this class to be used as an optional step if a lock screen is added. bug:23893721 Change-Id: I15478e0f0d8d8771cbdce6ccf0f508cbd5dd4f36