Merge pull request #17707 from sergi/978696

Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Conflicts:
	apps/communications/contacts/test/unit/contact2vcard_test.js