Merge "Clear BiometricScheduler when biometric HAL dies"