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

Change-Id: I858364149ce1ec4dd796d7bc52c5b82099ba55b0