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

Change-Id: I26ad39aa405aa08fce0b26ef183678d08667ac04