am fbac9bdf: am 0cda5911: Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.

Merge commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae'

* commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae':
  Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.