Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 697a74cfc5" into nyc-mr2-dev-plus-aosp
am: 3f665d1778  -s ours

Change-Id: I7fcee70fda5479cebc76ea53e86701c8a57782c3