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 am: 1c0fa9c717
am: 6f4bb40996 -s ours
Change-Id: I48933863c2939f35435fc82cfebe358c5c18ab70
This commit is contained in: