Merge "Remove product specific strings from Contacts" into ub-contactsdialer-i-dev
am: 1f71d595a8

Change-Id: I5bb39a78ee73ba06133ceeee0c69cd606769aeac