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