clean up TRDS again + move into ContactsCommon for other packages

like Dialer

Change-Id: If721411432ece3754bbc4af80208d47835f355c4