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

Change-Id: Ic5f47e574c482c1890ce508dfaf901f58c5dd994