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

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

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