Merge "Dismiss BiometricPrompt when screen turns off" into qt-dev
am: 373c37f7ec

Change-Id: I77bc941c4d78a9dd89fb748351fe318c0960994a