Merge "Cronet: add test server" am: b271755c1d

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

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