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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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