Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3 am: 0202b460 am: 697a74cf" into nyc-mr2-dev-plus-aosp