Merge "Remove duplicate Contacts/tests res-common resources" into ub-contactsdialer-g-dev
am: fe33e36380

Change-Id: I692fe990a744f8bc4b14501141680f944bd76f8c