[automerger skipped] Revert "Merge history of CTS" am: 2f82a83bb1 -s ours

am skip reason: Change-Id I91190d8644ff7a7dfaf4fa3f2d43c17f67dfac11 with SHA-1 fcabfc688d is in history

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

Change-Id: Ia7438802f22c22ae4a38024a8876ef7f4eeaa7a6
tree: df59350490570719e8e80c417045e814b53c746a
  1. tests/
  2. Tethering/