[automerger skipped] DO NOT MERGE: Update DownloadProvider for correct meteredness am: b627002ea9  -s ours
am: 50dee28845

Change-Id: I8bd0b45a02d62ee19682eb0599d3bd9aba384ac4