Merge "Add framework-connectivity-pre-jarjar-without-cronet" into main