Merge "FingerprintService should request resetLockout for the specified sensor"