Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am: 73b49fc7e8 am: 8c456f7f39 am: 5902fdad90 am: f906cf3102 am: 63036e2fec" into nyc-mr2-dev-plus-aosp
am: a546f6ff50  -s ours

Change-Id: I3f2c5d501c0a773f60a01aa5328b481eaeff0bdb