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

Change-Id: I7f061cb858ed38f880c47874273aaeac9573693a