Merge "Move vCard related codes to com.android.contacts.vcard."