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

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

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