[automerger skipped] Merge history of CTS am: 4cf61e4609 -s ours

am skip reason: Change-Id I64ae039794c33ac907adace6941b2986f3def8af with SHA-1 9b5abdd194 is in history

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

Change-Id: I2eca50246f39a29ad71b704296a4146082ec8752
tree: 945ca824bfa43f618d95c65f89d4a8f7ae07cec6
  1. tests/
  2. Tethering/