Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am: 32d2b4c7af  -s ours am: 18ade37c6b am: 05318c125f am: 68979dd543 am: 4529abc0f7 am: 8e41995ee5" into nyc-mr2-dev-plus-aosp
am: c70b994b41  -s ours

Change-Id: I5380d61b5d00ff5d098597f3171cd8687797ee7f