Merge "Revert "MediaProvider: Fix where condition of delete queries"" am: 654f73a379
am: 645dcd1e3c

Change-Id: Iaf21612636b7b8038b4188c0ced2468d59544b4f