Fix broken Contacts tests

Fix broken dependencies on InjectedServices because its name space
was conflicting with the TestCommon package in ContactsCommon

After rebuilding both ContactsCommon and Contacts, you might have to
clear out your data/app folder by doing

adb root; adb remount; adb shell
cd data/app
rm *.*

and then doing adb sync again

Change-Id: Iabbe19b4a40d3ec76c410c0352ea48ba9e344a34
9 files changed