Merge changes I77ed66b3,Iaedc26c5

* changes:
  Un-overload Biometric UI negative button
  Start UDFPS sensors only after BiometricPrompt UI is showing