[automerger skipped] Merge "DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod." into mainline-prod am: 2d2be033e2 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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