Merge "Support deleting PhoneLookupHistory rows with empty phone numbers." am: 177a18757e am: 39f17ed927
am: 7fb9676009

Change-Id: Ia49058e71cd2909d507f1ba08498f200509bb580