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
am: f2688ddcb7

Change-Id: Ibdbf06398dc508b01561b912bdbcb1b419965b4d