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