Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80 am: 6dbcefeea6" into nyc-mr2-dev-plus-aosp
am: 8f4427caa1  -s ours

Change-Id: I935716229f2b2e60df3dcdac5a27fd0400d9895c