fixes #17367, CPF and CNPJ br validation issue

(cherry picked from commit 621e979d4eec2dacb7f5dee370de282477fb46fd)