[automerger skipped] Fix ConnectivityManagerTest#testFactoryReset flaky am: 846032e945 -s ours

am skip reason: Merged-In I95050be703b7c97da7a14541ac74718fdcbd7f13 with SHA-1 5fab2d6c17 is already in history

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

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