Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 17010dc0d2 am: bc7aae3610 am: 0d774967ba am: 7b1ae648a4 am: b5ee31237f" into nyc-mr2-dev-plus-aosp
am: f5163cec88  -s ours

Change-Id: I5867c5e05d38f8af6f615ae613ddb1ef4ab0b939