Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev