Merge "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"