Merge "Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric""