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

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

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