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

Change-Id: I6e2a50c80c12c9cd88f36a019fa814713f724c82