Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37 am: 6795459a am: ede3a784" into nyc-mr2-dev-plus-aosp