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

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

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