Merge "Fix ConnectivityManagerTest#testFactoryReset flaky" am: 9b20b7d82f

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

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