Merge changes from topic "cronet-114.0.5715.0" am: a2175bd595

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

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