Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main am: 734738767c

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

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