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

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

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