Merge "Add sensorId to IBiometricAuthenticator methods"