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

Change-Id: I3f09ace288c956b41f2a987dd74e4b2fc9738e96