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

Change-Id: I67de0ed141df6d6921fc6f7813d067d6a1564206