Merge "Restore ConnectivityManagerTest into presubmits" into main am: 05a82947f3

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

Change-Id: I4d614b669319b9ccdaaa931281dd64ed8e1c91cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>