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

Change-Id: I94bf6ded9a57fcecea8cde7bcee02febf537018e