Settings: Switch back to udfps_enroll_enrolling_non_scroll layout

New one seems halfbaked? The UDFPS icon is misaligned when using it and
progress circle is missing.

Change-Id: I19d0a1ff973d79381f0f315469c823afedde9c02