Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"

This reverts commit 0725bea86e6f7d9de80fad4e3d9c3f6fff338e81.

Reason for revert: Settings crash
Bug: 120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
3 files changed