Merge "Make the VCardEntry more robust against badly behaving resolvers. Additionally make the ImportTestResolver return the right result Bug:2521447"