DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3 am: f70dd1fbc1 -s ours am: 60f17b8505
am: ca44afff8a
Change-Id: I7317621b2b33749792826e296b99dab1f5bed203
This commit is contained in: