Merge "BiometricPrompt negative button should show "cancel" after onAuthenticated" into qt-dev
am: 031e60c2f6

Change-Id: I2dcd6f31684f1cecae70e0b0d1a4d40bc4f4f654