Merge "Added content provider for PhoneLookupHistory." am: 56104bbc9f am: ab197a7c67
am: 1129d555f1

Change-Id: Ifdc6249335a505d2afefb4aa016a75df3ce7a487