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
am: 4529abc0f7

Change-Id: I344a012ddf84b2cdee290ab5c2fb055b50013248