Merge "Add sensorId to IFingerprintService#authenticate"