Hand merge from cupcake_dcm to donut, part 3.
Hand merge from cupcake_dcm to donut, part 3.

Modify VCardManager so that it uses the latest vCard importer code.

This Change MUST be comitted with #1853 and #1854.

bmaupin/android-sms-plus