DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s ours am: d9a7f11334 am: 2436f1e49d am: 90efb1a88d am: 25a7e0e952 am: ee4bc735dc
am: 54898b75e7 -s ours
Change-Id: I5af69734ed7182ac8dab5d0eee79be4cba61fb6a
This commit is contained in: