Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b49229f76a378336c55d658e2e186973fe88a58
tree: f16bc1c5c6f22a691ab3f2a6e159d3bc3182b702
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING