Merge changes from topic "delete-cronet-disabled-support" am: f128ba3461

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

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