Merge "Add framework-connectivity-pre-jarjar-without-cronet" into main am: 63178543ed

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

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