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

Change-Id: Ibf3948b22a460559a95b1bf55d44d4586efc329d