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

Change-Id: I0c2ad88e0b321e51f3e89181d12d63062bdbb048