tree 1012f798664d3d106f27496958f127c6f07eb7a3
parent 32d2b4c7afa564bcba25cd73be3783878f0dd2fd
parent ee8e0e8ae3b02801ce5f27dc6bee41b4ed30e5ba
author Jeff Sharkey <jsharkey@android.com> 1480641193 +0000
committer android-build-merger <android-build-merger@google.com> 1480641193 +0000

DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675  -s ours am: 1da786d723 am: af5f47caca
am: ee8e0e8ae3

Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18