DO NOT MERGE Improve testability of SIM import code.

For Iec6eb441fe197daceb24e87288f8e0c5ac0ce2cf

test
ran GoogleContactsTests

Change-Id: I7d34e68f389143f94c26190cd9b3206ca871c64e
(cherry picked from commit 52d8cae888457d9639696a19db29a2ff36deca85)
7 files changed