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

Change-Id: I2ee7d96ea30b79b06f309fd6c9a0f00be1845110