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

Change-Id: I8595d95b008a97bd7aad314bc81dff15a3a89a38