Merge "Move spanned utility class only needed for tests" into ub-contactsdialer-g-dev