[libcommhistory] Combine unresolved groups by short number match

Groups are matched only on full, exact phone numbers, so that phone
number matching can be done more accurately by the contacts layer (which
can correctly handle conflicts). For unresolved phone numbers, we must
combine groups by the short number match so that differently formatted
numbers are still combined for the user despite being separate.