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

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

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