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

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

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