Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3 am: 0202b460 Change-Id: I8c74be211eb1b7497b630ef53c7812d9156f1863