Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am: 32d2b4c7af  -s ours am: 18ade37c6b am: 05318c125f
am: 68979dd543

Change-Id: I451cba0003a6dbea88d718c332971386c539dad7