Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0 am: bc7aae36 am: 0d774967 am: 7b1ae648 am: b5ee3123" into nyc-mr2-dev-plus-aosp