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

Change-Id: Id82f8577d3ed25b1e0805082b843fcba71947388