Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" into main am: 734738767c am: 9931686d78 am: 0837019a95

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

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