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

Change-Id: I54fbf6b5892beeb0bca6e889cc44038b882b7780