[automerger skipped] Merge "Merge history of CTS" into rvc-d1-dev-plus-aosp am: c7b4a1b29d -s ours

am skip reason: Change-Id Ia3d5f2201ce67308df8e2689f6c99e28049a4877 with SHA-1 997838cf13 is in history

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

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