Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev