[automerger skipped] Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd" into qt-qpr1-dev-plus-aosp
am: b3774dfe29 -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 058af41a42 is in history

Change-Id: Ia1e8264a22574683bdfe45c35a398badb4f3a5e8