[automerger skipped] Merge history of CTS am: 6a41dd4d8e -s ours am: 8ed398fd4d -s ours am: 907e27ad71 -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: Ibbef5c525caeff4c8fc5b2d425bd8798373f0c7b
tree: 9ab52df35139c2926ced68e3e0bd57b1d2be165e
  1. tests/
  2. Tethering/