am 9284dec7: Merge change I4c05ba1f into eclair

Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp

* commit '9284dec737da58a92b3aa916a357e700d291a68a':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf