Improve contact sync

- Merge all user ids of a key into one raw contact (related to #659)
- Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id, deletion) will be updated into contact db
- Only add keyrings to contact db that are not expired nor revoked