Merge "Grant MediaProvider access to /mnt/media_rw"