Merge commit 'c013ec1553366bb08b5433bfdd8bb59bb1fd3b4f' of sso://googleplex-android/platform/packages/providers/DownloadProvider into HEAD
Change-Id: I63fba0903ef33ed871305de89b0dbb55d8f755b0