[automerger skipped] Merge "Merge history of CTS" into rvc-d1-dev-plus-aosp am: c7b4a1b29d -s ours am: 4fdbf486ae -s ours

am skip reason: Change-Id Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is in history

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

Change-Id: I94830a607dff22fb30c5ed1a638db0e856cae2db
tree: 9ab52df35139c2926ced68e3e0bd57b1d2be165e
  1. tests/
  2. Tethering/