Merge "Cronet: add TestUploadDataProvider" am: c7dafdd6fc

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

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