Merge "Update DownloadStorageProvider to include MediaStore.Downloads."