DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours
am: 60cc001b28
Change-Id: Ic21f6cc9072ae65ba67f117a21c4703e8f8cf6ea
This commit is contained in: