Revert "Add enroll_1_1 with preview window id" am: 921df7abd2

Change-Id: I787e7f8c951df9969b5db721d93d460c0960ad3e