DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4 am: 50102e63da  -s ours am: e94d76436b am: 40b4b1f774
am: ced9dde8c0

Change-Id: I00217abf1fb1f9f772547250d24dc30ea78c6683