DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4 am: 50102e63da -s ours am: e94d76436b am: 40b4b1f774 am: ced9dde8c0
am: 18f2836082
Change-Id: I3a350e0b20187e66480bdb03344b46f3b42e3737
This commit is contained in: