Merge "Update MediaStore_DownloadsTest to use ProviderTestUtils.scanFile()."