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

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

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