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

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

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