Merge "Check clatd does not stop when suspended network is disconnected" am: d15b397606 am: 3f8661db20 am: 52f35853cc

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

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