Merge changes from topic "biometric-service-migration"

* changes:
  Remove strings from low level onError(...) calls
  Prepare BiometricService for migration to a module