[automerger skipped] Merge "Merge history of CTS" into stage-aosp-master am: 667aeac161 -s ours am: bfec25dc1f -s ours am: 82630fe4be -s ours

am skip reason: Change-Id I30d52c4df571c894b7797300e8f56ddd4b2cc2dd with SHA-1 35cd54f7a0 is in history

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

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