Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am: e49ba8b3d8 am: 0202b4601d am: 2e61d93a57" into nyc-mr2-dev-plus-aosp
am: 6684747f69  -s ours

Change-Id: Id36a2c5c0ccfe053c0a1e72172bb904cbca797dd