[automerger skipped] Merge history of CTS am: 43e624246b -s ours am: a4a3eafb27 -s ours am: cea311393b -s ours

am skip reason: Change-Id Ic89c084604788b4d41cf854e5015c8ce7791c64d with SHA-1 6554b75697 is in history

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

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