Bug 1000037 - Refactor and re-enable test_import_contacts_gmail.py
Merge pull request #20694 from zacc/bug_1000037

Bug 1000037 - Refactor and re-enable test_import_contacts_gmail.py