Merge "Change BiometricService/AuthController interface to sensorId"