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: Ib784ca6a840f4a89bb28f4930544ff9c6f37b82e
tree: aa5dc103fa124c653a4ff5dd44f1a4819bcf187d
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING