Move ErrorContains to an internal package Upstream-commit: 6ed5db6243243c8b7ee3ff165f21bda4465124e5 Component: engine