Merge "6/n: Have FaceService extend BiometricService"