Merge "Remove telephony-common dependency in ContactsProvider." am: 98e70111da
am: bd8b124784

Change-Id: I868dda8612e7b997d48ace5229ae2b006fd0533b