Adapt new code for Contacts to work with EAS.

Test plan:
All tests in tests/general/contacts + tests/api/test_contacts.py pass.
EAS sync does not fail.