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

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

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