Merge "Support deleting PhoneLookupHistory rows with empty phone numbers."
am: 177a18757e

Change-Id: I52ea18dd089a7ba7ac85e22bbf080e3650c5deeb