Merge "Revert "Use biometricUnlockController state change to show the unlock ripple."" into tm-qpr-dev