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

Change-Id: Ia298b5408374d17ac37e6d9e0e9f2b26a637098f