Merge "Add support for uploading and downloading." am: 316ce8acca

Original change: https://android-review.googlesource.com/c/platform/development/+/1728650

Change-Id: Ie410316f1e99a045445a5fee6e19abc799e7c547