[automerger skipped] Split out connectivity-t-pre-jarjar and tests am: 2ba9dbe163 am: c033c24658 -s ours

am skip reason: Merged-In I3d0c081c4a7422e128beee11c0156f01b0377c96 with SHA-1 7858562b31 is already in history

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

Change-Id: I8671726cf8e01afeea9f04c48700b929599939ab