Merge "cronet: add variable to disable cronet tests on tm-mainline-prod" am: 3d5efcb7e9 am: bfab06c6ab

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

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