Merge "Revert "MediaProvider: Fix where condition of delete queries""