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
Change-Id: Ie3be31b7010a3fae500b547fde31056084b3e2b7
This commit is contained in: