Reorganize import in contacts provider

Change-Id: If3afb134ea36bd93859efcd114885526e1592b91
73 files changed