Merge "Diable ConnectivityManagerTest#testFactoryReset" am: 8c59e582a5 am: 849fcba7ae

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

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