Merge changes from topic "biometric-refactor"

* changes:
  2/n: Refactor out common BiometricService code
  1/n: Move fingerprint-service related code to biometrics/fingerprint