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

Change-Id: I1db35f63b5b6730eb140510edc25615fc80947aa