[automerger skipped] Merge "Remove delay from enroll start button" into...
[automerger skipped] Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfe am: 59538f62
am: 2c403efa -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 1ae8beab is in history
Change-Id: Ice37b65cf67b091bfc17a76c874c0bd38cdfe646