Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d
am: 697a74cfc5

Change-Id: I6d12d7c77b7b77fe66bdd8f5af8a14000e013c42