Merge "ConnectivityManagerTest: clean up when connectToCell fails" am: fb4ab74a09 am: b1818d0920 am: 2dcf965d23

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

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