Fix the add_remove_remove_contact test
& Update the upload_vcf_contacts_to_device function

Test: https://android-build.corp.google.com/builds/abtd/run/L18100030002248796
Bug: 323048143

https://paste.googleplex.com/5411856589520896


Change-Id: Id3d88f18dda3a4a64d0a9ee7013fdd767d867784
3 files changed