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

Change-Id: I7d3ea9e3db0e5bf73376bf90070fa5c12d2013b6