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

Change-Id: I881dcdd4a1da08173e74f5b831c716decf21c752