Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev
am: 54926ba6a9

Change-Id: I151f4f09e2de5c7999b0ed13afa7b712781d468f