tree c25c74eeec8ab445276f5d9c1805903215fd49ad
parent 3b0aa060a3a937702b64782cbb91f88595466ab3
parent b9a0b79675be81a54eda5f04015eea56f353fde8
author Jeff Sharkey <jsharkey@android.com> 1480640196 +0000
committer android-build-merger <android-build-merger@google.com> 1480640196 +0000

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

Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138