Merge "Wire file deletion to go through MediaProvider"