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

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

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