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

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

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