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

Change-Id: Ie36cf1be304acd25988886343893240d3094551a