Merge "Cronet: add TestUploadDataProvider" am: c7dafdd6fc am: ce939f80c5 am: ea7460f46b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2332470

Change-Id: Ie803fc969772a6f24e6198bb8070bdc779e78ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>