[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: d1e331db
am: c889474c -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 058af41a is in history
Change-Id: Iff6b53ad8b61618e62cc24717bec3b7c6207fde6