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

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

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