Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 6eee8e37fd am: 6795459a80 am: ede3a78432" into nyc-mr2-dev-plus-aosp
am: 7b5acb8d51  -s ours

Change-Id: I125ecde2fcf6ccac1babcb159daf752ed2ed58bf