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

Change-Id: I30abd24766074caf2032db1885d900f21a389669