Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
am: 73b49fc7e8

Change-Id: I65b86aaaec4033f19b3f3560d1c57bf32f1a4d5e