Merge "Don't show FP error canceled message" into pi-dev

    @Override

    public void onAuthenticationError(int errMsgId, CharSequence errString) {

        if (errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {

            // Only happens if we get preempted by another activity. Ignored.

            return;

        }

        showError(errString);

        setFingerprintIconVisibility(false);

    }