Merge "Check connectivity is restored after cleanup" am: 2a3b764014

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

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