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

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

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