Merge "Listen for IFingerprintServiceLockoutResetCallback death"