Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102
am: 63036e2fec

Change-Id: Idd85e1ca306e5e875cc6aefb8b886d20390f7d1a