Merge "Don't use linked mediastore uris in DownloadProvider operations." into qt-dev
am: 4344e7c721

Change-Id: Iaf52026e9d67f97b94cc0426a460f94b5fa358ec