Merge changes from topic "revert-3005178-revert-3001326-revert-2998737-revert-2980591-cronet_121_0_6167_71-JBOUFGJXPX-ICXECJPUPA-OOMALUYYUV-HXQZEVTNSQ" into main am: 22cc321820

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

Change-Id: I0efb31b9d4df8989ff1a99ef03f44c16dc55d58d
Signed-off-by: Automerger Merge Worker <[email protected]>