Revert "Revert "Add enroll_1_1 with preview window id""

This reverts commit 921df7abd29ad086a684b2820a0fa7c21bf19280.

Change-Id: I13a54a8288e122f7c02f2b23d6aaf21dfd782282
4 files changed