am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads

Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads