[automerger skipped] Split out connectivity-t-pre-jarjar and tests am: 2ba9dbe163 am: a03f2d68f1 am: c0d09fa313 am: acadaf5e69 -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: Iffdb8a244f451e9ead5fb32fd202fce35cb1c810