Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 2e61d93a57
am: b36e99e3e8 -s ours
Change-Id: I3e4cf734181c73147133e68acf33f6b2b8367b0e
This commit is contained in: