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