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

Change-Id: I39e3e686b1fd75f5e633a467f6ccb736751355ed
2 files changed