Merge "Revert "Auto advance fingerprint enrollment when user taps on the sensor""