Moving more logic into ContactDatabaseHelper

This is in preparation for making DataRowHandlers
top-level classes

Change-Id: I861aa3ea5cde977283641317222b6b3d48282d98
2 files changed