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

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

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