[automerger skipped] Merge history of CTS am: 6a41dd4d8e -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/+/13014426

Change-Id: I0a9ff01c89ca043ba87faa94c6c85e63e0b8c0bd
tree: ab3f9d73112fe3ad4dcec228a84c1dbd105a9c55
  1. tests/
  2. Tethering/