This reverts commit a95e7c3c09.
This causes a bug where you cannot access fingerprint from settings.
bug:27152471
Change-Id: I4f3078a81b66d44bb6f29ed3afc501e0b56a369e
Update SetupChooseLockGeneric to use SetupWizardPreferenceLayout,
which is a layout designed to be used with Preference v14.
Change-Id: I31f372b5f70382a9f6502c790cb8981277a8d5e1