Merge "Cronet: add TestUploadDataProvider" am: c7dafdd6fc am: 62b35c7319

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

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