Merge "Move SMS raw db deletion to phone process." am: 69057e49f0
am: 35d15d3269

Change-Id: If0a6a92614df0691b34604c4186db2b232fbe55b