Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s ours am: d9a7f11334 am: 2436f1e49d am: 90efb1a88d am: 25a7e0e952 am: 15aa9cb01a" into nyc-mr2-dev-plus-aosp
am: 3173494043 -s ours
Change-Id: I81ac352c2231f8f4cc4ab9988fa2388ae5fda669
This commit is contained in: