Merge "Run error callback when BiometricPrompt dismissed early" into rvc-qpr-dev-plus-aosp