Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd" into qt-qpr1-dev-plus-aosp