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: 8e41995ee5
am: 77ed6ca277 -s ours
Change-Id: I311618924d0a2cf0ac373f0f1c9fdc1c3e96050e
This commit is contained in: