Merge "Move SMS raw db deletion to phone process." am: 479ec92c27
am: f784db5cae

Change-Id: Ib90080a6fad7ad8914390df8e4aa92749669f1a9