Merge "Revert "Cronet: add test server"" am: 0f116bff50 am: 37cfba09b9 am: 9110817c08

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

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