Merge "Diable ConnectivityManagerTest#testFactoryReset" am: 8c59e582a5

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

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