migrate new setupcompat and setupdesign to SetupChooseLockGeneric

Test: cd tests/robotests && mma
Bug: 117080118
Change-Id: I6a29ef5294040d353ee1a0f2bf9ce69de7de9094
3 files changed