Merge "Revert "Diable ConnectivityManagerTest#testFactoryReset"" into main am: 76edec4f97 am: 0712d59d98

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

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