Merge "Cronet: add test server" am: b271755c1d am: 599fa960e7

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

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