Merge "MediaProvider: allow in-place updates for media files with incorrect path" into qt-dev
am: 8efc14145a

Change-Id: Ia84b149fd0a00239a8c145e9810882ce91675fde