Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90
am: f906cf3102

Change-Id: I1ee07eed9799b5f51af5788f0a983cc939a5fe90