Merge "Surface IBiometricsFace#userActivity to FaceManager"